# HG changeset patch
# User Edouard Tisserant
# Date 1550059706 -3600
# Node ID 889c43872f4cd51d70ce504ee81033450564f1fe
# Parent  6a4f9a061994fe1a28e2f18d83aa24e9eef5d0e4
Fix startup of wxGlade base HMI. Wx calls were issued from non-wx thread (main).

diff -r 6a4f9a061994 -r 889c43872f4c wxglade_hmi/wxglade_hmi.py
--- a/wxglade_hmi/wxglade_hmi.py	Wed Feb 13 09:41:35 2019 +0100
+++ b/wxglade_hmi/wxglade_hmi.py	Wed Feb 13 13:08:26 2019 +0100
@@ -132,32 +132,39 @@
         else:
             define_hmi = ""
 
-        declare_hmi = "\n".join(["%(name)s = None\n" % x for x in main_frames])
-        declare_hmi += "\n".join(["\n".join(["%(class)s.%(h)s = %(h)s" %
-                                             dict(x, h=h) for h in x['handlers']])
-                                  for x in hmi_objects])
+        declare_hmi = \
+"\n".join(["%(name)s = None\n" % x for x in main_frames]) + \
+"\n".join(["\n".join(["%(class)s.%(h)s = %(h)s" %
+                          dict(x, h=h) for h in x['handlers']])
+                      for x in hmi_objects]) + """\
+
+def OnCloseFrame(evt):
+    wx.MessageBox(_("Please stop PLC to close"))
+
+def InitHMI():
+"""+"\n".join(["""\
+    %(name)s = %(class)s(None)
+    %(name)s.Bind(wx.EVT_CLOSE, OnCloseFrame)
+    %(name)s.Show()
+
+""" % x for x in main_frames]) + """\
+def CleanupHMI():
+""" + "\n".join(["""\
+    if %(name)s is not None: 
+        %(name)s.Destroy()
+""" % x for x in main_frames])
+
         global_hmi = ("global %s\n" % ",".join(
             [x["name"] for x in main_frames]) if len(main_frames) > 0 else "")
-        init_hmi = "\n".join(["""\
-def OnCloseFrame(evt):
-    wx.MessageBox(_("Please stop PLC to close"))
-
-%(name)s = %(class)s(None)
-%(name)s.Bind(wx.EVT_CLOSE, OnCloseFrame)
-%(name)s.Show()
-""" % x for x in main_frames])
-        cleanup_hmi = "\n".join(
-            ["if %(name)s is not None: %(name)s.Destroy()" % x
-             for x in main_frames])
 
         self.PreSectionsTexts = {
             "globals": define_hmi,
             "start":   global_hmi,
-            "stop":    global_hmi + cleanup_hmi
+            "stop":    global_hmi + "wx.CallAfter(CleanupHMI)\n"
         }
         self.PostSectionsTexts = {
             "globals": declare_hmi,
-            "start":   init_hmi,
+            "start":   "wx.CallAfter(InitHMI)\n",
         }
 
         if len(main_frames) == 0 and \