Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default setting fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2007-03-16 19:09:58 +00:00
parent 7b2d175c47
commit 37867b24f6
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/wx/tools/XRCed/xrced.py
View File

@@ -105,7 +105,7 @@ class Frame(wx.Frame):
self.inIdle = False self.inIdle = False
# Load our own resources # Load our own resources
self.res = xrc.XmlResource('') self.res = xrc.EmptyXmlResource()
# !!! Blocking of assert failure occurring in older unicode builds # !!! Blocking of assert failure occurring in older unicode builds
try: try:
quietlog = wx.LogNull() quietlog = wx.LogNull()

25
wxPython/wx/tools/XRCed/xxx.py
View File

@@ -320,9 +320,11 @@ class xxxObject:
try: try:
self.params[param].update(value) self.params[param].update(value)
except KeyError: except KeyError:
p = xxxParam(g.tree.dom.createElement(param)) elem = g.tree.dom.createElement(param)
p = xxxParam(elem)
p.update(value) p.update(value)
self.params[param] = p self.params[param] = p
self.node.appendChild(elem)
# Special processing for growablecols-like parameters # Special processing for growablecols-like parameters
# represented by several nodes # represented by several nodes
def special(self, tag, node): def special(self, tag, node):
@@ -856,13 +858,6 @@ class xxxSizerItem(xxxChildContainer):
if 'pos' in self.child.allParams: if 'pos' in self.child.allParams:
self.child.allParams = self.child.allParams[:] self.child.allParams = self.child.allParams[:]
self.child.allParams.remove('pos') self.child.allParams.remove('pos')
# Set defaults for some children types
if isinstance(self.child, xxxContainer) and not self.child.isSizer:
for param,v in self.defaults_panel.items():
self.set(param, v)
elif isinstance(self.child, xxxObject):
for param,v in self.defaults_control.items():
self.set(param, v)
def resetChild(self, xxx): def resetChild(self, xxx):
xxxChildContainer.resetChild(self, xxx) xxxChildContainer.resetChild(self, xxx)
# Remove pos parameter - not needed for sizeritems # Remove pos parameter - not needed for sizeritems
@@ -1205,7 +1200,8 @@ def MakeEmptyDOM(className):
def MakeEmptyXXX(parent, className): def MakeEmptyXXX(parent, className):
# Make corresponding DOM object first # Make corresponding DOM object first
elem = MakeEmptyDOM(className) elem = MakeEmptyDOM(className)
# If parent is a sizer, we should create sizeritem object, except for spacers # Special handling, e.g. if parent is a sizer, we should create
# sizeritem object, except for spacers, etc.
if parent: if parent:
if parent.isSizer and className != 'spacer': if parent.isSizer and className != 'spacer':
sizerItemElem = MakeEmptyDOM(parent.itemTag) sizerItemElem = MakeEmptyDOM(parent.itemTag)
@@ -1224,7 +1220,16 @@ def MakeEmptyXXX(parent, className):
pageElem.appendChild(elem) pageElem.appendChild(elem)
elem = pageElem elem = pageElem
# Now just make object # Now just make object
return MakeXXXFromDOM(parent, elem) xxx = MakeXXXFromDOM(parent, elem)
# Special defaults for new panels and controls
if isinstance(xxx, xxxSizerItem):
if isinstance(xxx.child, xxxContainer) and not xxx.child.isSizer:
for param,v in xxxSizerItem.defaults_panel.items():
xxx.set(param, v)
elif isinstance(xxx.child, xxxObject):
for param,v in xxxSizerItem.defaults_control.items():
xxx.set(param, v)
return xxx
# Make empty DOM element for reference # Make empty DOM element for reference
def MakeEmptyRefDOM(ref): def MakeEmptyRefDOM(ref):