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

Merge recent changes from 2.8 branch.

Browse Source 
Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1592,7 +1592,8 @@ class PrefsDialog(wx.Dialog):
self.PostCreate(pre)
self.checkControls = {} # map of check IDs to (control,dict,param)
xxx = sys.modules['xxx']
##xxx = sys.modules['xxx']
import xxx
d = xxx.xxxSizerItem.defaults_panel
self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_panel')
@@ -1716,12 +1717,15 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
# Preferences
conf.allowExec = conf.Read('Prefs/allowExec', 'ask')
p = 'Prefs/sizeritem_defaults_panel'
import xxx
if conf.HasEntry(p):
sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
##sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
xxx.xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
p = 'Prefs/sizeritem_defaults_control'
if conf.HasEntry(p):
sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
##sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
xxx.xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
# Add handlers
wx.FileSystem.AddHandler(wx.MemoryFSHandler())
# Create main frame
@@ -1783,9 +1787,12 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
# Preferences
wc.DeleteGroup('Prefs')
wc.Write('Prefs/allowExec', conf.allowExec)
v = sys.modules['xxx'].xxxSizerItem.defaults_panel
import xxx
##v = sys.modules['xxx'].xxxSizerItem.defaults_panel
v = xxx.xxxSizerItem.defaults_panel
if v: wc.Write('Prefs/sizeritem_defaults_panel', DictToString(v))
v = sys.modules['xxx'].xxxSizerItem.defaults_control
###v = sys.modules['xxx'].xxxSizerItem.defaults_control
v = xxx.xxxSizerItem.defaults_control
if v: wc.Write('Prefs/sizeritem_defaults_control', DictToString(v))
wc.Flush()