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
This commit is contained in:
@@ -1,3 +1,9 @@
|
|||||||
|
0.1.8-1
|
||||||
|
-------
|
||||||
|
|
||||||
|
Fixed SetItemBold and editing 'growable' properties of
|
||||||
|
wxFlexGridSizer.
|
||||||
|
|
||||||
0.1.8-0
|
0.1.8-0
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
@@ -94,10 +94,7 @@ class ParamBinaryOr(PPanel):
|
|||||||
value.append(self.values[i])
|
value.append(self.values[i])
|
||||||
# Add ignored flags
|
# Add ignored flags
|
||||||
value.extend(ignored)
|
value.extend(ignored)
|
||||||
if value:
|
self.SetValue('|'.join(value))
|
||||||
self.SetValue(reduce(lambda a,b: a+'|'+b, value))
|
|
||||||
else:
|
|
||||||
self.SetValue('')
|
|
||||||
self.SetModified()
|
self.SetModified()
|
||||||
dlg.Destroy()
|
dlg.Destroy()
|
||||||
|
|
||||||
@@ -172,10 +169,7 @@ class ParamStyle(ParamBinaryOr):
|
|||||||
[self.valuesGeneric[i]
|
[self.valuesGeneric[i]
|
||||||
for i in range(listBoxGeneric.GetCount())
|
for i in range(listBoxGeneric.GetCount())
|
||||||
if listBoxGeneric.IsChecked(i)] + ignored
|
if listBoxGeneric.IsChecked(i)] + ignored
|
||||||
if value:
|
self.SetValue('|'.join(value))
|
||||||
self.SetValue(reduce(lambda a,b: a+'|'+b, value))
|
|
||||||
else:
|
|
||||||
self.SetValue('')
|
|
||||||
self.SetModified()
|
self.SetModified()
|
||||||
dlg.Destroy()
|
dlg.Destroy()
|
||||||
|
|
||||||
@@ -639,10 +633,7 @@ class ParamContent(PPanel):
|
|||||||
self.freeze = True
|
self.freeze = True
|
||||||
if not value: value = []
|
if not value: value = []
|
||||||
self.value = value
|
self.value = value
|
||||||
if value:
|
repr_ = '|'.join(map(str, value))
|
||||||
repr_ = reduce(lambda a,b: '%s|%s' % (a,b), value)
|
|
||||||
else:
|
|
||||||
repr_ = ''
|
|
||||||
self.text.SetValue(repr_) # update text ctrl
|
self.text.SetValue(repr_) # update text ctrl
|
||||||
self.freeze = False
|
self.freeze = False
|
||||||
def OnButtonEdit(self, evt):
|
def OnButtonEdit(self, evt):
|
||||||
@@ -678,11 +669,7 @@ class ParamContentCheckList(ParamContent):
|
|||||||
self.freeze = True
|
self.freeze = True
|
||||||
if not value: value = []
|
if not value: value = []
|
||||||
self.value = value
|
self.value = value
|
||||||
if value:
|
repr_ = '|'.join(map(str,value))
|
||||||
if len(value) == 1: repr_ = str(value)
|
|
||||||
else: repr_ = reduce(lambda a,b: '%s|%s' % (a,b), value)
|
|
||||||
else:
|
|
||||||
repr_ = ''
|
|
||||||
self.text.SetValue(repr_) # update text ctrl
|
self.text.SetValue(repr_) # update text ctrl
|
||||||
self.freeze = False
|
self.freeze = False
|
||||||
|
|
||||||
@@ -740,7 +727,7 @@ class ParamIntList(ParamContent):
|
|||||||
def OnButtonEdit(self, evt):
|
def OnButtonEdit(self, evt):
|
||||||
if self.textModified: # text has newer value
|
if self.textModified: # text has newer value
|
||||||
try:
|
try:
|
||||||
self.value = eval(self.text.GetValue())
|
self.value = map(int, self.text.GetValue().split('|'))
|
||||||
except SyntaxError:
|
except SyntaxError:
|
||||||
wx.LogError('Syntax error in parameter value: ' + self.GetName())
|
wx.LogError('Syntax error in parameter value: ' + self.GetName())
|
||||||
self.value = []
|
self.value = []
|
||||||
|
@@ -1149,10 +1149,11 @@ class XML_Tree(wx.TreeCtrl):
|
|||||||
self.PopupMenu(menu, evt.GetPosition())
|
self.PopupMenu(menu, evt.GetPosition())
|
||||||
menu.Destroy()
|
menu.Destroy()
|
||||||
|
|
||||||
# Redefine to force the update of font dimentions
|
# Redefine to force the update of font dimentions on wxGTK
|
||||||
def SetItemBold(self, item):
|
if wx.Platform == '__WXGTK__':
|
||||||
wx.TreeCtrl.SetItemBold(self, item)
|
def SetItemBold(self, item, state=True):
|
||||||
self.SetIndent(self.GetIndent())
|
wx.TreeCtrl.SetItemBold(self, item, state)
|
||||||
|
self.SetIndent(self.GetIndent())
|
||||||
|
|
||||||
# Apply changes
|
# Apply changes
|
||||||
def Apply(self, xxx, item):
|
def Apply(self, xxx, item):
|
||||||
|
Reference in New Issue
Block a user