[gnue] r8874 - trunk/gnue-forms/src/uidrivers/wx26/widgets

[johannes]

Author: johannes
Date: 2006-10-19 09:35:27 -0500 (Thu, 19 Oct 2006)
New Revision: 8874

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
Log:
Fixed stacking of boxes so it works on wxMac too


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-19 
13:22:21 UTC (rev 8873)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-19 
14:35:27 UTC (rev 8874)
@@ -330,38 +330,38 @@
         # Build the base panel for the managed box.  This panel will be the
         # parent for container-panel of the box (as well as the StaticBoxSizer
         # if a box-label is requested).
-        panel = wx.Panel(parent, -1)
-        panel.SetSizer(wx.BoxSizer(wx.VERTICAL))
+        self._container = wx.Panel(parent, -1)
+        self._container.SetSizer(wx.BoxSizer(wx.VERTICAL))
 
         # If the has a block assigned we can bind the mouse wheel event to
         # scroll through the block's records.
         if self._gfObject.get_block() is not None:
-            panel.Bind(wx.EVT_MOUSEWHEEL, self.__on_mousewheel)
+            self._container.Bind(wx.EVT_MOUSEWHEEL, self.__on_mousewheel)
 
-        self._container = wx.Panel(panel, -1)
+        self._sizer = create_gridbag()
+
         self._entry_pos = self.__use_second_one() and 2 or 1
 
-        gbs = create_gridbag()
         if self._vertical_:
-            gbs.AddGrowableCol(self._entry_pos - 1)
+            self._sizer.AddGrowableCol(self._entry_pos - 1)
         else:
-            gbs.AddGrowableRow(self._entry_pos - 1)
+            self._sizer.AddGrowableRow(self._entry_pos - 1)
 
-        self._container.SetSizer(gbs)
-
         # If a label is requested for the box, we have to wrap the container
         # with a StaticBoxSizer.
         if self._gfObject.label is not None:
-            box = wx.StaticBox(panel, -1, self._gfObject.label)
-            stb = wx.StaticBoxSizer(box, wx.VERTICAL)
-            stb.Add(self._container, 1, wx.EXPAND | wx.ALL, 5)
-            add = stb
+            box_title = wx.StaticBox(self._container, -1, self._gfObject.label)
+            box = wx.StaticBoxSizer(box_title, wx.VERTICAL)
+            box.Add(self._sizer, 1, wx.EXPAND | wx.ALL, 5)
+
+            add = box
         else:
-            add = self._container
+            add = self._sizer
 
-        panel.GetSizer().Add(add, 1, wx.EXPAND | wx.TOP | wx.BOTTOM, 6)
+        self._container.GetSizer().Add(add, 1, wx.EXPAND | wx.TOP | \
+                wx.BOTTOM, 6)
 
-        self.widget = panel
+        self.widget = self._container
         self.getParent().add_widgets(self, spacer)
 
         return self._container

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-10-19 13:22:21 UTC 
(rev 8873)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-10-19 14:35:27 UTC 
(rev 8874)
@@ -66,14 +66,14 @@
         parent = event.container
 
         # Box-Panel
-        self._container = wx.Panel(parent, -1)
-        self._container.SetSizer(_base.create_gridbag())
+        self._container = parent
+        self._sizer = _base.create_gridbag()
 
-        box = wx.StaticBox(parent, -1, self._gfObject.label)
-        stb = wx.StaticBoxSizer(box, wx.VERTICAL)
-        stb.Add(self._container, 1, wx.EXPAND | wx.ALL, 5)
+        box_title = wx.StaticBox(parent, -1, self._gfObject.label)
+        box = wx.StaticBoxSizer(box_title, wx.VERTICAL)
+        box.Add(self._sizer, 1, wx.EXPAND | wx.ALL, 5)
 
-        self.widget = stb
+        self.widget = box
         owner.add_widgets(self, 0)
 
         return self._container
@@ -99,8 +99,7 @@
             box.Add(item, 1, wx.ALIGN_CENTER_VERTICAL)
             item = box
 
-        self._container.GetSizer().Add(item, ui_widget.chr_pos,
-                ui_widget.chr_span, flags)
+        self._sizer.Add(item, ui_widget.chr_pos, ui_widget.chr_span, flags)
 
 
 # =============================================================================

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-10-19 13:22:21 UTC 
(rev 8873)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-10-19 14:35:27 UTC 
(rev 8874)
@@ -55,14 +55,13 @@
         @param spacer: not used for boxes
         """
 
-        sizer = self._container.GetSizer()
         pos = (0, self.last_item)
         span = (1, 1)
         add = False
 
         if ui_widget.label:
             add = True
-            sizer.Add(ui_widget.label, pos, span, wx.ALIGN_BOTTOM)
+            self._sizer.Add(ui_widget.label, pos, span, wx.ALIGN_BOTTOM)
 
         if ui_widget.widget:
             add = True
@@ -81,12 +80,12 @@
                 box.Add((0,0))
                 item = box
 
-            sizer.Add(item, pos, span, flags)
+            self._sizer.Add(item, pos, span, flags)
 
         # Only columns having a stretch greater than zero require a growable
         # column.  Setting a stretch of 0 breaks the size calculation anyway.
         if add and ui_widget.stretch:
-            sizer.AddGrowableCol(self.last_item, ui_widget.stretch)
+            self._sizer.AddGrowableCol(self.last_item, ui_widget.stretch)
 
         self.last_item += add
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-10-19 13:22:21 UTC 
(rev 8873)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-10-19 14:35:27 UTC 
(rev 8874)
@@ -56,7 +56,6 @@
         @param spacer: not used for boxes
         """
 
-        sizer = self._container.GetSizer()
         pos = (self.last_item, 0)
         span = (1, 1)
         add = False
@@ -69,7 +68,7 @@
             flags = wx.ALIGN_CENTER_VERTICAL
             if ui_widget.growable:
                 flags |= wx.EXPAND
-            sizer.Add(ui_widget.label, pos, span, flags)
+            self._sizer.Add(ui_widget.label, pos, span, flags)
 
         if ui_widget.widget:
             add = True
@@ -86,10 +85,10 @@
                 pos = (self.last_item, self._entry_pos - 1)
                 span = (1, 1)
 
-            sizer.Add(item, pos, span, wx.EXPAND)
+            self._sizer.Add(item, pos, span, wx.EXPAND)
 
         if add and ui_widget.growable:
-            sizer.AddGrowableRow(self.last_item, ui_widget.stretch)
+            self._sizer.AddGrowableRow(self.last_item, ui_widget.stretch)
 
         self.last_item += add