[gnue] r9301 - in trunk: gnue-forms/src/uidrivers/wx26/widgets gnue-navigator/src

[reinhard]

Author: reinhard
Date: 2007-01-12 14:01:00 -0600 (Fri, 12 Jan 2007)
New Revision: 9301

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
   trunk/gnue-navigator/src/UIwx26.py
Log:
Ok, I think that's it for now.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 19:45:02 UTC 
(rev 9300)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 20:01:00 UTC 
(rev 9301)
@@ -128,7 +128,7 @@
             if embed is not None:
                 self.main_window = embed['frame']
                 parent = embed['parent']
-                self.__embedded = True
+                self.__embedded = embed['navigator']
             else:
                 parent = self.main_window = wx.Frame(None, -1)
         else:
@@ -517,6 +517,7 @@
                 self.main_window.GetStatusBar().Hide()
                 self.main_window.SetStatusBar(None)
             self.__base_panel.Hide()
+            self.__embedded.event_form_closed()
         else:
             self.main_window.Hide()
 

Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 19:45:02 UTC (rev 9300)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 20:01:00 UTC (rev 9301)
@@ -72,7 +72,7 @@
     self.menu = MenuBar(self)
     self.frame.SetMenuBar(self.menu)
 
-    wx.EVT_MENU(self.frame, ID_EXIT,  self.__on_close)
+    wx.EVT_MENU(self.frame, ID_EXIT,  self.__on_exit)
     wx.EVT_MENU(self.frame, ID_ABOUT, self.__on_about)
 
     self.splitter= wx.SplitterWindow(self.frame,-1)
@@ -112,7 +112,9 @@
 
     if gConfigNav('embedForms') == "%s" % True: 
         self.__instance._uiinstance._parentContainer = {
-                'frame': self.frame, 'parent': self.panel2}
+                'frame': self.frame,
+                'parent': self.panel2,
+                'navigator': self}
 
     app.MainLoop()
 
@@ -141,6 +143,9 @@
     else:
         self.frame.Destroy()
 
+  def __on_exit(self, event):
+      self.frame.Close()
+
   def __on_about(self, event):
     text = _("GNUE Navigator")+"\n"+      \
     _("  Version : ")+"%s\n"+         \
@@ -199,6 +204,14 @@
             step._params)
 
 
+  # Called when an embedded form is closed.
+  def event_form_closed(self):
+
+      self.__current_form = None
+      self.frame.SetMenuBar(self.menu)
+      self.helpText.Show()
+
+
 ID_EXIT = wx.NewId()
 ID_ABOUT = wx.NewId()