X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0c20d947b3cc411c3c19d1ad1e507419d167fd7..c5750ccb5f8092e23e353b3923d5a78af17e672f:/wxPython/tools/XRCed/xxx.py

diff --git a/wxPython/tools/XRCed/xxx.py b/wxPython/tools/XRCed/xxx.py
index 0435ea5737..cf141ee949 100644
--- a/wxPython/tools/XRCed/xxx.py
+++ b/wxPython/tools/XRCed/xxx.py
@@ -11,11 +11,19 @@ import wxPython.lib.wxpTag
 
 from params import *
 
-# Parameter value class
-class xxxParam:
-    # Standard use: for text nodes
+# Base class for interface parameter classes
+class xxxNode:
     def __init__(self, node):
         self.node = node
+    def remove(self):
+        self.node.parentNode.removeChild(self.node)
+        self.node.unlink()
+
+# Generic (text) parameter class
+class xxxParam(xxxNode):
+    # Standard use: for text nodes
+    def __init__(self, node):
+        xxxNode.__init__(self, node)
         if not node.hasChildNodes():
             # If does not have child nodes, create empty text node
             text = tree.dom.createTextNode('')
@@ -26,17 +34,28 @@ class xxxParam:
         self.textNode = text
     # Value returns string
     def value(self):
-        return str(self.textNode.data)
+        return self.textNode.data
     def update(self, value):
         self.textNode.data = value
-    def remove(self):
-        self.node.parentNode.removeChild(self.node)
-        self.node.unlink()
+
+# Integer parameter
+class xxxParamInt(xxxParam):
+    # Standard use: for text nodes
+    def __init__(self, node):
+        xxxParam.__init__(self, node)
+    # Value returns string
+    def value(self):
+        try:
+            return int(self.textNode.data)
+        except ValueError:
+            return -1                   # invalid value
+    def update(self, value):
+        self.textNode.data = str(value)
 
 # Content parameter
-class xxxParamContent:
+class xxxParamContent(xxxNode):
     def __init__(self, node):
-        self.node = node
+        xxxNode.__init__(self, node)
         data, l = [], []                # data is needed to quicker value retrieval
         nodes = node.childNodes[:]      # make a copy of the child list
         for n in nodes:
@@ -78,9 +97,9 @@ class xxxParamContent:
         self.data = value
 
 # Content parameter for checklist
-class xxxParamContentCheckList:
+class xxxParamContentCheckList(xxxNode):
     def __init__(self, node):
-        self.node = node
+        xxxNode.__init__(self, node)
         data, l = [], []                # data is needed to quicker value retrieval
         nodes = node.childNodes[:]      # make a copy of the child list
         for n in nodes:
@@ -118,10 +137,10 @@ class xxxParamContentCheckList:
                 self.node.appendChild(itemElem)
                 l.append((itemText, itemElem))
             self.l = l
-#        else:
-#            for i in range(len(value)):
-#                self.l[i][0].data = value[i]
-#                self.l[i][1].setAttributedata = value[i]
+        else:
+            for i in range(len(value)):
+                self.l[i][0].data = value[i][0]
+                self.l[i][1].setAttribute('checked', str(value[i][1]))
         self.data = value
 
 ################################################################################
@@ -176,7 +195,7 @@ class xxxObject:
                     else:
                         self.params[tag] = xxxParamContent(node)
                 elif tag == 'font': # has children
-                    self.params[tag] = xxxParamFont(self, node)
+                    self.params[tag] = xxxParamFont(element, node)
                 else:                   # simple parameter
                     self.params[tag] = xxxParam(node)
             else:
@@ -199,24 +218,27 @@ class xxxObject:
 
 ################################################################################
 
-class xxxParamFont(xxxParam):
+# This is a little special: it is both xxxObject and xxxNode
+class xxxParamFont(xxxObject, xxxNode):
     allParams = ['size', 'style', 'weight', 'family', 'underlined',
                  'face', 'encoding']
     def __init__(self, parent, element):
         xxxObject.__init__(self, parent, element)
-        self.parentNode = element       # required to behave similar to DOM node
+        xxxNode.__init__(self, element)
+        self.parentNode = parent       # required to behave similar to DOM node
         v = []
         for p in self.allParams:
             try:
-                v.append(str(self.params[p].data))
+                v.append(str(self.params[p].value()))
             except KeyError:
                 v.append('')
         self.data = v
     def update(self, value):
         # `value' is a list of strings corresponding to all parameters
         elem = self.element
-        for node in elem.childNodes:
-            elem.removeChild(node)
+        # Remove old elements first
+        childNodes = elem.childNodes[:]
+        for node in childNodes: elem.removeChild(node)
         i = 0
         self.params.clear()
         v = []
@@ -230,6 +252,8 @@ class xxxParamFont(xxxParam):
             v.append(value[i])
             i += 1
         self.data = v
+    def value(self):
+        return self.data
 
 ################################################################################
 
@@ -483,20 +507,20 @@ class xxxParamMulti:
 class xxxFlexGridSizer(xxxGridSizer):
     specials = ['growablecols', 'growablerows']
     allParams = ['cols', 'rows', 'vgap', 'hgap'] + specials
-    paramDict = {'growablecols':ParamContent, 'growablerows':ParamContent}
+    paramDict = {'growablecols':ParamIntList, 'growablerows':ParamIntList}
     # Special processing for growable* parameters
     # (they are represented by several nodes)
     def special(self, tag, node):
-        if tag not in self.params.keys():
+        if tag not in self.params:
             self.params[tag] = xxxParamMulti()
-        self.params[tag].append(xxxParam(node))
+        self.params[tag].append(xxxParamInt(node))
     def setSpecial(self, param, value):
         # Straightforward implementation: remove, add again
         self.params[param].remove()
         del self.params[param]
-        for str in value:
+        for i in value:
             node = tree.dom.createElement(param)
-            text = tree.dom.createTextNode(str)
+            text = tree.dom.createTextNode(str(i))
             node.appendChild(text)
             self.element.appendChild(node)
             self.special(param, node)