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

[reinhard]

Author: reinhard
Date: 2006-10-31 06:50:06 -0600 (Tue, 31 Oct 2006)
New Revision: 8961

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/page.py
Log:
Some fixes for box alignment.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-31 
08:33:39 UTC (rev 8960)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-31 
12:50:06 UTC (rev 8961)
@@ -270,7 +270,7 @@
 # Create a new GridBagSizer
 # =============================================================================
 
-def create_gridbag(ecs=(5, 10)):
+def create_gridbag(ecs=(5, 10), gap=True):
     """
     Create a new GridBagSizer with a given size for empty cells.  Horizontal
     and vertical gap is set depending on the OS.

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-10-31 08:33:39 UTC 
(rev 8960)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-10-31 12:50:06 UTC 
(rev 8961)
@@ -67,15 +67,22 @@
         owner = self.getParent()
         parent = event.container
 
-        # Box-Panel
         self._container = parent
-        self._sizer = _base.create_gridbag((self._uiDriver.cellWidth,
-                self._uiDriver.cellHeight))
 
+        # the border
         box_title = wx.StaticBox(parent, -1, self._gfObject.label)
+
+        # a vbox linked to the border
         box = wx.StaticBoxSizer(box_title, wx.VERTICAL)
-        box.Add(self._sizer, 1, wx.EXPAND | wx.ALL, 5)
 
+        # a gridbag that will contain all the widgets inside the box
+        self._sizer = wx.GridBagSizer()
+        self._sizer.SetEmptyCellSize((self._uiDriver.cellWidth,
+                self._uiDriver.cellHeight))
+        # leave some border on top and bottom
+        box.Add(self._sizer, 1), wx.TOP | wx.BOTTOM,
+                self._uiDriver.cellHeight/4)
+
         self.widget = box
         owner.add_widgets(self, 0)
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-10-31 08:33:39 UTC 
(rev 8960)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-10-31 12:50:06 UTC 
(rev 8961)
@@ -71,8 +71,9 @@
         if self.managed:
             page_sizer = wx.BoxSizer(wx.VERTICAL)
         else:
-            page_sizer = _base.create_gridbag((self._uiDriver.cellWidth,
-                self._uiDriver.cellHeight))
+            page_sizer = wx.GridBagSizer()
+            page_sizer.SetEmptyCellSize((self._uiDriver.cellWidth,
+                    self._uiDriver.cellHeight))
 
         self._container.SetSizer(page_sizer)
 
@@ -105,22 +106,16 @@
         if self.managed:
             sizer.Add(item, ui_widget.stretch, wx.EXPAND | wx.ALL, 4)
         else:
-            flags = wx.EXPAND
-            border = 0
+            flags = wx.ALIGN_CENTER
             if not ui_widget.growable:
                 box = wx.BoxSizer(wx.HORIZONTAL)
                 box.Add(item, 1, wx.ALIGN_CENTER_VERTICAL)
                 item = box
 
-            if ui_widget._gfObject._type == 'GFBox':
-                border = 3
-                flags |= wx.ALL
+            sizer.Add(item, ui_widget.chr_pos, ui_widget.chr_span, flags)
 
-            sizer.Add(item, ui_widget.chr_pos, ui_widget.chr_span, flags,
-                    border)
 
 
-
 # =============================================================================
 # Configuration data
 # =============================================================================