Changeset 2947

Timestamp:

03/21/07 04:49:49 (2 years ago)

Author:

ed

Message:

Removed all the stuff that was deprecated in 0.7 in anticipation of the 0.8 release. These are:

- The dRadioGroup class. This has been replaced by dRadioList
- The use of the 'borderFlags' parameter in sizers
- The dGridSizer methods 'isRowGrowable()' and 'isColGrowable()', which have been replaced by 'getRowExpand()' and 'getColExpand()', respectively.

Any remaining references to these items have been updated in code that contained them.

Files:

• trunk/dabo/dEvents.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/__init__.py (modified) (2 diffs)
• trunk/dabo/ui/uiwx/dGridSizer.py (modified) (3 diffs)
• trunk/dabo/ui/uiwx/dRadioGroup.py (deleted)
• trunk/dabo/ui/uiwx/dSizerMixin.py (modified) (4 diffs)

trunk/dabo/dEvents.py

@@ -274 +274 @@
-        return issubclass(objectClass, (ui.dBitmapButton, ui.dButton,
-                ui.dCheckBox, ui.dComboBox, ui.dDropdownList, ui.dEditBox,
-Group
+List
-                ui.dTimer, ui.dToggleButton, ui.dMenuItem))
-    appliesToClass = classmethod(appliesToClass)

trunk/dabo/ui/uiwx/__init__.py

@@ -112 +112 @@
-from dMenuItem import *
-import dMessageBox
-from dRadioGroup import dRadioGroup
-from dRadioList import dRadioList
-from dPanel import dPanel
@@ -1083 +1082 @@
-
-def fontMetricFromFont(txt, font):
+    if isinstance(font, dabo.ui.dFont):
+        font = font._nativeFont
-    wind = wx.Frame(None)
-    dc = wx.ClientDC(wind)

trunk/dabo/ui/uiwx/dGridSizer.py

@@ -63 +63 @@
-    def append(self, item, layout="normal", row=-1, col=-1, 
-            rowSpan=1, colSpan=1, alignment=None, halign="left", 
-
-
+
-        """ Inserts the passed item at the specified position in the grid. If no
-        position is specified, the item is inserted at the first available open 
-        cell as specified by the Max* properties.       
-        """
-        if borderSides is None:
-            if borderFlags is not None:
-                warnings.warn(_("Deprecation warning: use 'borderSides' parameter instead."), DeprecationWarning, stacklevel=2)
-                borderSides = borderFlags
-        (targetRow, targetCol) = self._determineAvailableCell(row, col)
-        if isinstance(item, (tuple, int)):
@@ -245 +240 @@
-        
-    
-    def isRowGrowable(self, row):
-        warnings.warn(_("Deprecated; use 'getRowExpand' instead."), DeprecationWarning, stacklevel=2)
-        return self.getRowExpand(row)
-    
-    
-    def getRowExpand(self, row):
-        """Returns True if the specified row is growable."""
@@ -255 +245 @@
-        
-        
-    def isColGrowable(self, col):
-        warnings.warn(_("Deprecated; use 'getColExpand' instead."), DeprecationWarning, stacklevel=2)
-        return self.getColExpand(col)
-
-
-    def getColExpand(self, col):
-        """Returns True if the specified column is growable."""

trunk/dabo/ui/uiwx/dSizerMixin.py

@@ -81 +81 @@
-            
-    def append(self, obj, layout="normal", proportion=0, alignment=None,
-
-
+
-        """Adds the passed object to the end of the sizer layout."""
-
-        if borderSides is None:
-            if borderFlags is not None:
-                dabo.errorLog.write(_("Depracation warning: use 'borderSides' parameter instead."))
-                borderSides = borderFlags
-        return self.insert(len(self.Children), obj, layout=layout, proportion=proportion, 
-                alignment=alignment, halign=halign, valign=valign, border=border, 
@@ -102 +96 @@
-
-    def insert(self, index, obj, layout="normal", proportion=0, alignment=None,
-
-
+
-        """Inserts the passed object into the sizer layout at the specified position."""
-        if borderSides is None:
-            if borderFlags is not None:
-                dabo.errorLog.write(_("Deprecation warning: use 'borderSides' parameter instead."))
-                borderSides = borderFlags
-        if isinstance(layout, int):
-            # proportion was passed first
@@ -154 +143 @@
-    
-    def prepend(self, obj, layout="normal", proportion=0, alignment=None,
-
-
+
-        """Insert the object at the beginning of the sizer layout."""
-        return self.insert(0, obj, layout=layout, proportion=proportion,
-                alignment=alignment, halign=halign, valign=valign, border=border,
-, borderFlags=None)            
+)
-    prepend.__doc__ += _doc_additions
-    
@@ -626 +614 @@
-        if layout.lower() in ("expand", "ex", "exp", "x", "grow"):
-            _wxFlags = _wxFlags | self.expandFlag
+        elif layout.lower() == "shaped":
+            _wxFlags = _wxFlags | wx.SHAPED
-        elif layout.lower() == "fixed":
-            _wxFlags = _wxFlags | self.fixedFlag