Fixed SetItemBold and editing 'growable' properties of

wxFlexGridSizer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/CHANGES.txt b/wxPython/wx/tools/XRCed/CHANGES.txt
index b67fa46c290470373a2c3730e877a24c7188308c..39db47d1914013de4d24a08d894bafa15db60fe3 100644 (file)
--- a/wxPython/wx/tools/XRCed/CHANGES.txt
+++ b/wxPython/wx/tools/XRCed/CHANGES.txt
@@ -1,3 +1,9 @@
+0.1.8-1
+-------
+
+Fixed SetItemBold and editing 'growable' properties of 
+wxFlexGridSizer.
+
 0.1.8-0
 -------
 

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index 23bcf215249ef8731617304faf06e8ed12b08f4c..dfe6bd6ac6ce8f78a8b5b60f829caac46fd6aa8d 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -94,10 +94,7 @@ class ParamBinaryOr(PPanel):
                     value.append(self.values[i])
             # Add ignored flags
             value.extend(ignored)
-            if value:
-                self.SetValue(reduce(lambda a,b: a+'|'+b, value))
-            else:
-                self.SetValue('')
+            self.SetValue('|'.join(value))
             self.SetModified()
         dlg.Destroy()
 
@@ -172,10 +169,7 @@ class ParamStyle(ParamBinaryOr):
                      [self.valuesGeneric[i]
                       for i in range(listBoxGeneric.GetCount())
                       if listBoxGeneric.IsChecked(i)] + ignored
-            if value:
-                self.SetValue(reduce(lambda a,b: a+'|'+b, value))
-            else:
-                self.SetValue('')
+            self.SetValue('|'.join(value))
             self.SetModified()
         dlg.Destroy()
 
@@ -639,10 +633,7 @@ class ParamContent(PPanel):
         self.freeze = True
         if not value: value = []
         self.value = value
-        if value:
-            repr_ = reduce(lambda a,b: '%s|%s' % (a,b), value)
-        else:
-            repr_ = ''
+        repr_ = '|'.join(map(str, value))
         self.text.SetValue(repr_)  # update text ctrl
         self.freeze = False
     def OnButtonEdit(self, evt):
@@ -678,11 +669,7 @@ class ParamContentCheckList(ParamContent):
         self.freeze = True
         if not value: value = []
         self.value = value
-        if value:
-            if len(value) == 1: repr_ = str(value)
-            else: repr_ = reduce(lambda a,b: '%s|%s' % (a,b), value)
-        else:
-            repr_ = ''
+        repr_ = '|'.join(map(str,value))
         self.text.SetValue(repr_)  # update text ctrl
         self.freeze = False        
 
@@ -740,7 +727,7 @@ class ParamIntList(ParamContent):
     def OnButtonEdit(self, evt):
         if self.textModified:           # text has newer value
             try:
-                self.value = eval(self.text.GetValue())
+                self.value = map(int, self.text.GetValue().split('|'))
             except SyntaxError:
                 wx.LogError('Syntax error in parameter value: ' + self.GetName())
                 self.value = []

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 8e515841aeec6fadf93140e34ca0a05187f5ae23..c08b451fd44be44d733b853788bd92003886c8c1 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -1149,10 +1149,11 @@ class XML_Tree(wx.TreeCtrl):
         self.PopupMenu(menu, evt.GetPosition())
         menu.Destroy()
 
-    # Redefine to force the update of font dimentions
-    def SetItemBold(self, item):
-        wx.TreeCtrl.SetItemBold(self, item)
-        self.SetIndent(self.GetIndent())
+    # Redefine to force the update of font dimentions on wxGTK
+    if wx.Platform == '__WXGTK__':
+        def SetItemBold(self, item, state=True):
+            wx.TreeCtrl.SetItemBold(self, item, state)
+            self.SetIndent(self.GetIndent())
 
     # Apply changes
     def Apply(self, xxx, item):