Changeset 689
- Timestamp:
- 09/05/03 14:00:54 (5 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBSkinning/RBSkinning/SkinObject.py
r669 r689 241 241 return variables 242 242 243 def _GetEvalLocalsEx(self, variables): 244 variables.update(self._GetEvalLocals()) 245 return variables 243 def _GetEvalLocalsEx(self, variables, *args): 244 result = variables.copy() 245 result.update(self._GetEvalLocals()) 246 map(result.update, args) 247 return result 246 248 247 249 def EvalLocal(self, code, **variables): 248 250 return eval(code, self.globalnamespace, self._GetEvalLocals(**variables)) 249 251 250 def EvalLocalEx(self, code, variables, codefmtstr=None ):252 def EvalLocalEx(self, code, variables, codefmtstr=None, **kw): 251 253 if codefmtstr: 252 254 code = codefmtstr % code 253 return eval(code, self.globalnamespace, self._GetEvalLocalsEx(variables ))255 return eval(code, self.globalnamespace, self._GetEvalLocalsEx(variables, kw)) 254 256 255 257 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ trunk/RBSkinning/RBSkinning/wxPythonSkin/layout_table.py
r611 r689 42 42 #'expandcols': '[]', 43 43 #'expandcolrange': '(None, None)', 44 #' defaultcellsize': '(10, 22)',44 #'cellsize': '(10, 22)', 45 45 }) 46 46 … … 53 53 if not isinstance(self.winParent, wx.wxWindowPtr): self.winParent = None 54 54 55 kwSettings = self.wxSettingDict(['defaultcellsize'], [])55 cellsize = self.wxEvalCond('cellsize', wx.wxDefaultSize) 56 56 57 57 # Create the layout sizer 58 self.object = wxRBRowColSizer( **kwSettings)58 self.object = wxRBRowColSizer(cellsize) 59 59 self.wxInitialStandardOptions() 60 60 trunk/RBSkinning/RBSkinning/wxTools/wxRBRowColSizer.py
r611 r689 44 44 45 45 def SetDefaultCellSize(self, defaultcellsize=(RowColSizer.col_w, RowColSizer.row_h)): 46 self.col_w, self.row_h = itemsize46 self.col_w, self.row_h = defaultcellsize 47 47 48 48 def AddGrowableRow(self, *indicies):
