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

[reinhard]

Author: reinhard
Date: 2007-01-12 13:45:02 -0600 (Fri, 12 Jan 2007)
New Revision: 9300

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
   trunk/gnue-navigator/src/UIwx26.py
Log:
More fixes.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 19:28:53 UTC 
(rev 9299)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 19:45:02 UTC 
(rev 9300)
@@ -288,7 +288,9 @@
 
                 if not initial:
                     self.main_window.Layout()
-                    self.main_window.SetSizerAndFit(self.__master_sizer, True)
+                    if not self.__embedded:
+                        self.main_window.SetSizerAndFit(self.__master_sizer,
+                                True)
 
             finally:
                 self.main_window.Thaw()
@@ -508,8 +510,12 @@
                 and self.main_window.IsModal():
             self.main_window.EndModal(-1)
         elif self.__embedded:
-            self.main_window.SetToolBar(None)
-            self.main_window.SetStatusBar(None)
+            if self.main_window.GetToolBar():
+                self.main_window.GetToolBar().Hide()
+                self.main_window.SetToolBar(None)
+            if self.main_window.GetStatusBar():
+                self.main_window.GetStatusBar().Hide()
+                self.main_window.SetStatusBar(None)
             self.__base_panel.Hide()
         else:
             self.main_window.Hide()

Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 19:28:53 UTC (rev 9299)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 19:45:02 UTC (rev 9300)
@@ -66,6 +66,9 @@
     self.frame = wx.Frame(None, -1, "GNUe Navigator", size=wx.Size(600,400))
     self.frame.Bind(wx.EVT_CLOSE, self.__on_close)
 
+    frame_sizer = wx.BoxSizer(wx.VERTICAL)
+    self.frame.SetSizer(frame_sizer)
+
     self.menu = MenuBar(self)
     self.frame.SetMenuBar(self.menu)
 
@@ -73,6 +76,7 @@
     wx.EVT_MENU(self.frame, ID_ABOUT, self.__on_about)
 
     self.splitter= wx.SplitterWindow(self.frame,-1)
+    frame_sizer.Add(self.splitter, 1, wx.EXPAND)
 
     self.panel1 = wx.Panel(self.splitter)
     self.panel2 = wx.Panel(self.splitter)