gnue/designer/src PropertyEditor.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/12 12:01:14

Modified files:
        designer/src   : PropertyEditor.py 

Log message:
        Fixed deprecate bug in PropertyEditor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/PropertyEditor.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue/designer/src/PropertyEditor.py
diff -u gnue/designer/src/PropertyEditor.py:1.11 
gnue/designer/src/PropertyEditor.py:1.12
--- gnue/designer/src/PropertyEditor.py:1.11    Thu Jul 12 11:53:26 2001
+++ gnue/designer/src/PropertyEditor.py Thu Jul 12 12:01:14 2001
@@ -68,42 +68,52 @@
         self.grid.Destroy()
       self.grid = wxGrid(self.panel, -1, pos=wxPoint(0,0))
 
-      self.grid.CreateGrid(len(self.attributes.keys()),1)
-      self.grid.SetColLabelSize(0)
       self.rowList = self.attributes.keys()
       self.rowList.sort()
+
+
+      # Only show properties for nondeprecated values (unless set)
       i = 0
-      for key in self.rowList: 
+      while i < len(self.rowList):   
+        key = self.rowList[i]
+        if self.attributes[key].has_key ('Deprecated') and \
+           self.attributes[key]['Deprecated'] and \
+           (not hasattr(object, key) or \
+              (self.attributes[key].has_key('Default') and \
+               object.__dict__[key] == self.attributes[key]['Default'] ) ): 
+          self.rowList.pop(i)
+        else: 
+          i = i + 1
 
-        # Only show properties for nondeprecated values (unless set)
-        if not (self.attributes[key].has_key ('Deprecated') and \
-                self.attributes[key]['Deprecated'] and \
-                (not hasattr(object, key) or \
-                   (self.attributes[key].has_key('Default') and \
-                    object.__dict__[key] == self.attributes[key]['Default'] )
-                ) ): 
-
-          self.grid.SetRowLabelValue(i, string.upper(key[0]) + 
string.lower(key[1:]))
-
-          if self.attributes[key].has_key('ValueSet'): 
-            self.grid.SetCellEditor(i, 0, 
RestrictedCellEditor(self.attributes[key]))
-          elif self.attributes[key]['Typecast'] == GTypecast.boolean: 
-            self.grid.SetCellEditor(i, 0, BoolCellEditor(self.attributes[key]))
-          elif self.attributes[key]['Typecast'] in (GTypecast.integer, 
-                  GTypecast.number, GTypecast.whole):
-            self.grid.SetCellEditor(i, 0, IntCellEditor(self.attributes[key]))
-          else: 
-            self.grid.SetCellEditor(i, 0, CharCellEditor(self.attributes[key]))
-  
-          if hasattr(object, key): 
-            if self.attributes[key]['Typecast'] == GTypecast.boolean:
-              if object.__dict__[key]:    
-                self.grid.SetCellValue(i,0,"TRUE")
-              else: 
-                self.grid.SetCellValue(i,0,"FALSE")
+
+      self.grid.CreateGrid(len(self.rowList),1)
+      self.grid.SetColLabelSize(0)
+
+      i = 0
+
+      for key in self.rowList:
+
+        self.grid.SetRowLabelValue(i, string.upper(key[0]) + 
string.lower(key[1:]))
+
+        if self.attributes[key].has_key('ValueSet'): 
+          self.grid.SetCellEditor(i, 0, 
RestrictedCellEditor(self.attributes[key]))
+        elif self.attributes[key]['Typecast'] == GTypecast.boolean: 
+          self.grid.SetCellEditor(i, 0, BoolCellEditor(self.attributes[key]))
+        elif self.attributes[key]['Typecast'] in (GTypecast.integer, 
+                GTypecast.number, GTypecast.whole):
+          self.grid.SetCellEditor(i, 0, IntCellEditor(self.attributes[key]))
+        else: 
+          self.grid.SetCellEditor(i, 0, CharCellEditor(self.attributes[key]))
+
+        if hasattr(object, key): 
+          if self.attributes[key]['Typecast'] == GTypecast.boolean:
+            if object.__dict__[key]:    
+              self.grid.SetCellValue(i,0,"TRUE")
             else: 
-              self.grid.SetCellValue(i,0, "%s" % object.__dict__[key])
-          i = i + 1
+              self.grid.SetCellValue(i,0,"FALSE")
+          else: 
+            self.grid.SetCellValue(i,0, "%s" % object.__dict__[key])
+        i = i + 1
       self.onSize(None)
       EVT_GRID_CELL_CHANGE(self.grid, self.OnCellChange)