[gnue] r8162 - in trunk/gnue-forms/src/uidrivers/wx26: . widgets

[johannes]

Author: johannes
Date: 2006-02-12 12:51:16 -0600 (Sun, 12 Feb 2006)
New Revision: 8162

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Minor code cleanup (fixes size of toolbar for wxMSW)


Modified: trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py      2006-02-11 14:21:04 UTC 
(rev 8161)
+++ trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py      2006-02-12 18:51:16 UTC 
(rev 8162)
@@ -56,8 +56,9 @@
     # Make sure to disable the color-remapping in windows
     wx.SystemOptions.SetOption ('msw.remap', '0')
 
-    self.toolbar = self.container.CreateToolBar ()
+    self.toolbar = wx.ToolBar (self.container, -1)
     self.toolbar.SetToolBitmapSize ((24, 24))
+    self.container.GetSizer ().Add (self.toolbar, 0, wx.EXPAND | 
wx.ALIGN_TOP|wx.ALIGN_LEFT)
 
     return self.toolbar
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-02-11 14:21:04 UTC 
(rev 8161)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-02-12 18:51:16 UTC 
(rev 8162)
@@ -70,50 +70,45 @@
     if self._form.style != 'dialog':
       self.mainWindow = self._uiDriver._parentContainer
       if not self.mainWindow:
-        self.mainWindow = wx.Frame (None, -1, "", wx.DefaultPosition)
+        self.mainWindow = wx.Frame (None, -1)
     else:
-      self.mainWindow = wx.Dialog (None, wx.ID_ANY, "", wx.DefaultPosition,
-          wx.DefaultSize, wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+      self.mainWindow = wx.Dialog (None, -1)
 
-    self.containerFrame = self.mainWindow
     self.mainWindow.SetTitle (self._form.title)
+    self.mainWindow.SetIcons (self.__loadIcons ())
+    self.mainWindow.Bind (wx.EVT_CLOSE, self.__closeTrap, self.mainWindow)
 
-    topSizer = wx.BoxSizer (wx.VERTICAL)
+    frameSizer = wx.BoxSizer (wx.VERTICAL)
+    panelSizer = wx.BoxSizer (wx.VERTICAL)
 
-    self.mainWindow.Connect (wx.ID_ANY, wx.ID_ANY, wx.wxEVT_CLOSE_WINDOW,
-        self.__closeTrap)
+    basePanel = wx.Panel (self.mainWindow, -1)
+    basePanel.SetSizer (panelSizer)
 
-    if not self._form._features ['GUI:STATUSBAR:SUPPRESS']:
-      if isinstance (self.mainWindow, wx.Frame):
+    frameSizer.Add (basePanel, 1, wx.EXPAND)
+
+    # Add Statusbar, Toolbar and Menubar as requested and/or allowed
+    if self._form.style != 'dialog':
+      if not self._form._features ['GUI:STATUSBAR:SUPPRESS']:
         self.statusBar = self.mainWindow.CreateStatusBar ()
         self.statusBar.SetFieldsCount (5)
         self.statusBar.SetStatusWidths ([-1, 50, 50, 75, 75])
 
-    if self._form._layout.tabbed != 'none':
-      newWidget = TabbedWrapper (self)
-    else:
-      newWidget = BaseWrapper (self)
-
-    # Add the ScrolledWindow to the sizer, let it grow with newly available
-    # space and add a border of 6 pixels around it
-    topSizer.Add (newWidget, 1, wx.EXPAND | wx.ALIGN_LEFT | wx.ALL, 6)
-
-    if self._form.style != 'dialog':
       if not self._form._features.get ('GUI:MENUBAR:SUPPRESS'):
-        MenuBar (self._uiDriver, self.containerFrame, self._form)
+        MenuBar (self._uiDriver, self.mainWindow, self._form)
 
       if not self._form._features.get ('GUI:TOOLBAR:SUPPRESS'):
-        tlb = ToolBar (self._uiDriver, self.containerFrame, self._form)
-        # TODO: find a cleaner way to specify required size of the toolbar
-        newWidget.SetSizeHints (tlb.toolbar.GetSize () [0], -1)
+        tlb = ToolBar (self._uiDriver, basePanel, self._form)
 
-    self._containerToolkitWidget = newWidget
-    self._sizers = [(self.mainWindow, topSizer),
-                    (newWidget, newWidget.pageSizer)]
+    if self._form._layout.tabbed != 'none':
+      wrapper = TabbedWrapper (self, basePanel)
+    else:
+      wrapper = BaseWrapper (self, basePanel)
 
-    self.mainWindow.SetIcons (self.__loadIcons ())
+    self._containerToolkitWidget = wrapper
+    self._sizers = [(self.mainWindow, frameSizer),
+                    (wrapper, wrapper.pageSizer)]
 
-    return newWidget
+    return wrapper
 
 
   # ---------------------------------------------------------------------------
@@ -155,9 +150,9 @@
 
   def show (self):
 
-    self.containerFrame.Fit ()
-    self.containerFrame.Raise ()
-    self.containerFrame.Show ()
+    self.mainWindow.Fit ()
+    self.mainWindow.Raise ()
+    self.mainWindow.Show ()
 
 
   # ---------------------------------------------------------------------------
@@ -166,9 +161,9 @@
 
   def showModal (self):
 
-    self.containerFrame.Fit ()
-    self.containerFrame.Raise ()
-    self.containerFrame.ShowModal ()
+    self.mainWindow.Fit ()
+    self.mainWindow.Raise ()
+    self.mainWindow.ShowModal ()
 
 
   # ---------------------------------------------------------------------------
@@ -231,19 +226,21 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, uiForm):
+  def __init__ (self, uiForm, wxParent):
 
     self._uiForm   = uiForm
     self._uiDriver = uiForm._uiDriver
     self._gfObject = uiForm._gfObject
-    self.frame     = uiForm.containerFrame
     self._pages    = []
 
-    wx.ScrolledWindow.__init__ (self, self.frame, wx.ID_ANY)
+    wx.ScrolledWindow.__init__ (self, wxParent, wx.ID_ANY)
+    wxParent.GetSizer ().Add (self, 1, wx.EXPAND | wx.ALIGN_LEFT | wx.ALL, 6)
+
     self.pageSizer     = wx.BoxSizer (wx.VERTICAL)
     self.pageContainer = self._createPageContainer ()
 
     self.pageSizer.Add (self.pageContainer, 1, wx.EXPAND | wx.ALIGN_LEFT)
+    self.SetSizer (self.pageSizer)
 
 
   # ---------------------------------------------------------------------------