diff -r 95a0a427f3ef -r 131ea7f237b9 controls/DurationCellEditor.py --- a/controls/DurationCellEditor.py Fri Jun 15 18:03:25 2012 +0200 +++ b/controls/DurationCellEditor.py Mon Jun 25 20:03:53 2012 +0200 @@ -28,48 +28,30 @@ class DurationCellControl(wx.PyControl): - def _init_coll_MainSizer_Items(self, parent): - parent.AddWindow(self.Duration, 0, border=0, flag=wx.GROW) - parent.AddWindow(self.EditButton, 0, border=0, flag=wx.GROW) - - def _init_coll_MainSizer_Growables(self, parent): - parent.AddGrowableCol(0) - parent.AddGrowableRow(0) - - def _init_sizers(self): - self.MainSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0) - - self._init_coll_MainSizer_Items(self.MainSizer) - self._init_coll_MainSizer_Growables(self.MainSizer) - - self.SetSizer(self.MainSizer) - - def _init_ctrls(self, prnt): - wx.Control.__init__(self, id=-1, - name='DurationCellControl', parent=prnt, - size=wx.DefaultSize, style=0) - - # create location text control - self.Duration = wx.TextCtrl(id=-1, name='Duration', parent=self, - pos=wx.Point(0, 0), size=wx.Size(0, 0), style=wx.TE_PROCESS_ENTER) - self.Duration.Bind(wx.EVT_KEY_DOWN, self.OnDurationChar) - - # create browse button - self.EditButton = wx.Button(id=-1, label='...', - name='EditButton', parent=self, pos=wx.Point(0, 0), - size=wx.Size(30, 0), style=0) - self.EditButton.Bind(wx.EVT_BUTTON, self.OnEditButtonClick) - - self.Bind(wx.EVT_SIZE, self.OnSize) - - self._init_sizers() - ''' Custom cell editor control with a text box and a button that launches the DurationEditorDialog. ''' def __init__(self, parent): - self._init_ctrls(parent) + wx.Control.__init__(self, parent) + + main_sizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0) + main_sizer.AddGrowableCol(0) + main_sizer.AddGrowableRow(0) + + # create location text control + self.Duration = wx.TextCtrl(self, style=wx.TE_PROCESS_ENTER) + self.Duration.Bind(wx.EVT_KEY_DOWN, self.OnDurationChar) + main_sizer.AddWindow(self.Duration, flag=wx.GROW) + + # create browse button + self.EditButton = wx.Button(self, label='...', size=wx.Size(30, 0)) + self.Bind(wx.EVT_BUTTON, self.OnEditButtonClick, self.EditButton) + main_sizer.AddWindow(self.EditButton, flag=wx.GROW) + + self.Bind(wx.EVT_SIZE, self.OnSize) + + self.SetSizer(main_sizer) self.Default = None @@ -117,6 +99,7 @@ ''' def __init__(self, table): wx.grid.PyGridCellEditor.__init__(self) + self.Table = table def __del__(self):