Changeset 287
- Timestamp:
- 09/20/02 11:52:35 (6 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBSkinning/RBSkinning/wxPythonSkin/htmlwindow.py
r277 r287 44 44 }) 45 45 46 ctxVars = wxSkinLayoutObject.ctxVars.copy() 47 ctxVars.update(vars(html)) 48 46 49 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 47 50 #~ Public … … 50 53 def SkinInitialize(self): 51 54 winParent = self.wxGetParentObject(wx.wxWindowPtr) 52 Settings = map(self.wxEval, ['wxid', 'pos', 'size', 'style' ,])55 Settings = map(self.wxEval, ['wxid', 'pos', 'size', 'style']) 53 56 Settings.append(self.settings['name']) 54 57 self.object = html.wxHtmlWindow(winParent, *Settings) trunk/RBSkinning/RBSkinning/wxPythonSkin/layout.py
r286 r287 96 96 97 97 self.winParent.SetSizer(self.object) 98 self.object.SetSizeHints(self.winParent) # Be sure to set size hints after setting sizer!99 98 100 99 if self.wxEval('sizerAuto'): 101 100 self.winParent.SetAutoLayout(1) 102 101 if self.wxEval('sizerFit'): 102 self.object.SetSizeHints(self.winParent) # Be sure to set size hints after setting sizer! 103 103 self.object.Fit(self.winParent) 104 104 del self.winParent trunk/RBSkinning/RBSkinning/wxPythonSkin/wxSkinObject.py
r277 r287 77 77 default_settings[SkinObject.BaseSettingsInherit] += 'wxDef,' 78 78 79 ctxVars = vars(wx) 80 79 81 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 80 82 #~ Public … … 123 125 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 124 126 125 def wxEvalDefault(self, Setting, Default, ctxLocals=None, ctxGlobals=wx.__dict__): 126 assert ctxLocals is None # I don't think that ctxLocals was ever used... 127 assert ctxGlobals is wx.__dict__ 128 return self.EvalLocalEx(self.settings.get(Setting, Default), ctxGlobals) 127 def wxEvalDefault(self, Setting, Default): 128 return self.EvalLocalEx(self.settings.get(Setting, Default), self.ctxVars) 129 129 130 def wxEval(self, Setting, ctxLocals=None, ctxGlobals=wx.__dict__): 131 assert ctxLocals is None # I don't think that ctxLocals was ever used... 132 assert ctxGlobals is wx.__dict__ 133 return self.EvalLocalEx(self.settings.get(Setting), ctxGlobals) 130 def wxEval(self, Setting): 131 return self.EvalLocalEx(self.settings.get(Setting), self.ctxVars) 134 132 135 133 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 136 134 137 def wxSettingDict(self, Eval=[], NonEval=[], kwStart=None ):135 def wxSettingDict(self, Eval=[], NonEval=[], kwStart=None, *args, **kw): 138 136 result = kwStart or {} 139 for each in Eval: result[each] = self.wxEval(each )137 for each in Eval: result[each] = self.wxEval(each, *args, **kw) 140 138 for each in NonEval: result[each] = self.settings[each] 141 139 if 'wxid' in result:
