Changeset 3156

Timestamp:

06/05/07 13:55:34 (2 years ago)

Author:

ed

Message:

Changed the repr() method to default to Python's id() function for the id portion of the string; overrode the _getID() method in dPemMixin to return the wxPython GetId?() value.

Enhanced support for working with Wizards in showContainingPage().

Files:

• trunk/dabo/dObject.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dPemMixin.py (modified) (6 diffs)

trunk/dabo/dObject.py

@@ -94 +94 @@
-            # No name; use module.classname
-            nm = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
-
-
-
-
+
-        return "<%(nm)s (baseclass %(classname)s, id:%(_id)s)>" % locals()
-
+
+
+
+
+
+
+
-
-

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -680 +680 @@
-
-
+    def _getID(self):
+        """Override the default behavior to return the wxPython ID."""
+        return self.GetId()
+
+
-    def fitToSizer(self, extraWidth=0, extraHeight=0):
-        """Resize the control to fit the size required by its sizer."""
@@ -761 +766 @@
-        paged controls to switch to the page that contains this object.
-        """
+        try:
+            frm = self.Form
+        except:
+            frm = None
-        cntnr = self
+        iswiz = isinstance(frm, dabo.ui.dialogs.Wizard)
+        mtch = {True: dabo.ui.dialogs.WizardPage, False: dabo.ui.dPage}[iswiz]
-        while cntnr and not isinstance(cntnr, dabo.ui.dForm):
-
-
+
+
+
+
+
-            cntnr = cntnr.Parent
-    
@@ -1355 +1369 @@
-        redraw() hook method.
-        """
+        # Clear the idle flag.
+        self._needRedraw = False
-        if dc is None:
-            # First, clear any old drawing if requested
@@ -1365 +1381 @@
-        # Call the hook
-        self.redraw(dc)
-        # Clear the idle flag.
-        self._needRedraw = False
-#-      if self.Application.Platform == "Win":
-#-          print "REFRESH", time.time()
@@ -1472 +1486 @@
-        """
-        return None
+        
-
-    def _jiggleFontSize(self):
@@ -1479 +1494 @@
-        self.FontSize -= 1
-        self.Thaw()
+        
-
-    def _onFontPropsChanged(self, evt):