[gnue] r8956 - in trunk/gnue-forms/src/uidrivers: _base/widgets qt3 wx26

[johannes]

Author: johannes
Date: 2006-10-30 12:33:46 -0600 (Mon, 30 Oct 2006)
New Revision: 8956

Modified:
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt3/__init__.py
   trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
   trunk/gnue-forms/src/uidrivers/wx26/__init__.py
Log:
Fixed checking of bounding-boxes and rearrangement of box-child-widgets


Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-10-30 
18:00:07 UTC (rev 8955)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-10-30 
18:33:46 UTC (rev 8956)
@@ -188,9 +188,6 @@
                 self.chr_pos  = (self.chr_y, self.chr_x)
                 self.chr_span = (self.chr_h, self.chr_w)
 
-                # Check the bounding box of the parent
-                (left, top, right, bottom) = self.get_bounding_box()
-
                 if getattr(self._uiDriver, '__rearrange_boxes__', False):
                     self.__check_bounding_box()
 
@@ -204,6 +201,9 @@
 
     def __check_bounding_box(self):
 
+        # Check the bounding box of the parent
+        (left, top, right, bottom) = self.get_bounding_box()
+
         owner = self.getParent()
         if isinstance(owner._gfObject, GFBox):
             (oright, obottom) = owner.get_bounding_box()[2:]

Modified: trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2006-10-30 18:00:07 UTC 
(rev 8955)
+++ trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2006-10-30 18:33:46 UTC 
(rev 8956)
@@ -79,6 +79,8 @@
 
 class GFUserInterface(commonToolkit.GFUserInterface):
 
+    __rearrange_boxes__ = True
+
     # -------------------------------------------------------------------------
     # Constructor
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/qt3/__init__.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/__init__.py      2006-10-30 18:00:07 UTC 
(rev 8955)
+++ trunk/gnue-forms/src/uidrivers/qt3/__init__.py      2006-10-30 18:33:46 UTC 
(rev 8956)
@@ -1,4 +1,2 @@
 from UIdriver import *
 from UILoginHandler import *
-
-__rearrange_boxes__ = True

Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-10-30 18:00:07 UTC 
(rev 8955)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-10-30 18:33:46 UTC 
(rev 8956)
@@ -48,8 +48,14 @@
 class GFUserInterface (commonToolkit.GFUserInterface):
   """
   An implementation of the common GUI toolkit interface using wx 2.6+.
+
+  @cvar __rearrange_boxes__: if True the bounding boxes of widgets will be
+       checked.  Additionally all widgets having a position within a box-tag
+       will get a child of that box (in the xml-object-tree).
   """
 
+  __rearrange_boxes__ = True
+
   # ---------------------------------------------------------------------------
   # Constructor
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/__init__.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/__init__.py     2006-10-30 18:00:07 UTC 
(rev 8955)
+++ trunk/gnue-forms/src/uidrivers/wx26/__init__.py     2006-10-30 18:33:46 UTC 
(rev 8956)
@@ -24,4 +24,3 @@
 from UIdriver import GFUserInterface
 from UILoginHandler import *
 
-__rearrange_boxes__ = True