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

[reinhard]

Author: reinhard
Date: 2007-01-12 09:18:34 -0600 (Fri, 12 Jan 2007)
New Revision: 9288

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Create toolbar with frame as direct parent.


Modified: trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py      2007-01-12 14:41:28 UTC 
(rev 9287)
+++ trunk/gnue-forms/src/uidrivers/wx26/ToolBar.py      2007-01-12 15:18:34 UTC 
(rev 9288)
@@ -56,7 +56,7 @@
     # Make sure to disable the color-remapping in windows
     wx.SystemOptions.SetOption ('msw.remap', '0')
 
-    self.toolbar = wx.ToolBar (self.container, -1)
+    self.toolbar = self.container.CreateToolBar()
     self.toolbar.SetToolBitmapSize ((24, 24))
 
     return self.toolbar

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 14:41:28 UTC 
(rev 9287)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 15:18:34 UTC 
(rev 9288)
@@ -163,8 +163,8 @@
                 MenuBar(self._uiDriver, self.main_window, self._form)
 
             if not self._form._features.get ('GUI:TOOLBAR:SUPPRESS'):
-                tlb = ToolBar(self._uiDriver, self._container, self._form)
-                base_sizer.Add(tlb.toolbar, 0, wx.EXPAND)
+                tlb = ToolBar(self._uiDriver, self.main_window, self._form)
+                #base_sizer.Add(tlb.toolbar, 0, wx.EXPAND)
 
         # If the form is using tabs, we need to create a Notebook control as
         # page container, otherwise we can just use the base panel