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

untabified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-01-13 21:15:52 +00:00
parent fec9bb97b3
commit b81de788b4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wxPython/wx/tools/XRCed/params.py
View File

@@ -416,10 +416,10 @@ class ParamEncoding(ParamText):
class ContentDialog(wxDialog): class ContentDialog(wxDialog):
def __init__(self, parent, value): def __init__(self, parent, value):
# Load from resource # Load from resource
pre = wxPreDialog() pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT') g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
self.this = pre.this self.this = pre.this
self._setOORInfo(self) self._setOORInfo(self)
self.list = XRCCTRL(self, 'LIST') self.list = XRCCTRL(self, 'LIST')
# Set list items # Set list items
for v in value: for v in value:
@@ -466,10 +466,10 @@ class ContentDialog(wxDialog):
class ContentCheckListDialog(wxDialog): class ContentCheckListDialog(wxDialog):
def __init__(self, parent, value): def __init__(self, parent, value):
pre = wxPreDialog() pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST') g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
self.this = pre.this self.this = pre.this
self._setOORInfo(self) self._setOORInfo(self)
self.list = XRCCTRL(self, 'CHECK_LIST') self.list = XRCCTRL(self, 'CHECK_LIST')
# Set list items # Set list items
i = 0 i = 0
@@ -598,10 +598,10 @@ class ParamContentCheckList(ParamContent):
class IntListDialog(wxDialog): class IntListDialog(wxDialog):
def __init__(self, parent, value): def __init__(self, parent, value):
pre = wxPreDialog() pre = wxPreDialog()
g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST') g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
self.this = pre.this self.this = pre.this
self._setOORInfo(self) self._setOORInfo(self)
self.list = XRCCTRL(self, 'LIST') self.list = XRCCTRL(self, 'LIST')
# Set list items # Set list items
value.sort() value.sort()
@@ -774,10 +774,10 @@ class ParamFile(PPanel):
class ParamBitmap(PPanel): class ParamBitmap(PPanel):
def __init__(self, parent, name): def __init__(self, parent, name):
pre = wxPrePanel() pre = wxPrePanel()
g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP') g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
self.this = pre.this self.this = pre.this
self._setOORInfo(self) self._setOORInfo(self)
self.SetBackgroundColour(parent.GetBackgroundColour()) self.SetBackgroundColour(parent.GetBackgroundColour())
self.SetForegroundColour(parent.GetForegroundColour()) self.SetForegroundColour(parent.GetForegroundColour())
self.modified = self.freeze = False self.modified = self.freeze = False

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

@@ -49,9 +49,9 @@ class xxxParam(xxxNode):
def value(self): def value(self):
return self.textNode.data.encode(g.currentEncoding) return self.textNode.data.encode(g.currentEncoding)
def update(self, value): def update(self, value):
try: # handle exception if encoding is wrong try: # handle exception if encoding is wrong
self.textNode.data = unicode(value, g.currentEncoding) self.textNode.data = unicode(value, g.currentEncoding)
except UnicodeDecodeError: except UnicodeDecodeError:
wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate") wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
# Integer parameter # Integer parameter
@@ -502,8 +502,8 @@ class xxxSplitterWindow(xxxContainer):
allParams = ['orientation', 'sashpos', 'minsize', 'pos', 'size', 'style'] allParams = ['orientation', 'sashpos', 'minsize', 'pos', 'size', 'style']
paramDict = {'orientation': ParamOrientation, 'sashpos': ParamUnit, 'minsize': ParamUnit } paramDict = {'orientation': ParamOrientation, 'sashpos': ParamUnit, 'minsize': ParamUnit }
winStyles = ['wxSP_3D', 'wxSP_3DSASH', 'wxSP_3DBORDER', 'wxSP_BORDER', winStyles = ['wxSP_3D', 'wxSP_3DSASH', 'wxSP_3DBORDER', 'wxSP_BORDER',
'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE', 'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE',
'wxSP_NO_XP_THEME' ] 'wxSP_NO_XP_THEME' ]
class xxxGenericDirCtrl(xxxObject): class xxxGenericDirCtrl(xxxObject):
allParams = ['defaultfolder', 'filter', 'defaultfilter', 'pos', 'size', 'style'] allParams = ['defaultfolder', 'filter', 'defaultfilter', 'pos', 'size', 'style']