diff -r d51af006fa6b -r 64d8f52bc8c8 controls/DurationCellEditor.py --- a/controls/DurationCellEditor.py Fri Aug 11 15:18:19 2017 +0300 +++ b/controls/DurationCellEditor.py Mon Aug 14 19:13:01 2017 +0300 @@ -27,39 +27,39 @@ from dialogs.DurationEditorDialog import DurationEditorDialog class DurationCellControl(wx.PyControl): - + ''' Custom cell editor control with a text box and a button that launches the DurationEditorDialog. ''' def __init__(self, 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, size=wx.Size(0, -1), + self.Duration = wx.TextCtrl(self, size=wx.Size(0, -1), 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, -1)) 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 - + def SetValue(self, value): self.Default = value self.Duration.SetValue(value) - + def GetValue(self): return self.Duration.GetValue() @@ -90,7 +90,7 @@ def SetInsertionPoint(self, i): self.Duration.SetInsertionPoint(i) - + def SetFocus(self): self.Duration.SetFocus() @@ -100,13 +100,13 @@ ''' def __init__(self, table, colname): wx.grid.PyGridCellEditor.__init__(self) - + self.Table = table self.Colname = colname - + def __del__(self): self.CellControl = None - + def Create(self, parent, id, evt_handler): self.CellControl = DurationCellControl(parent) self.SetControl(self.CellControl) @@ -131,8 +131,8 @@ return self.EndEditInternal(row, col, grid, oldval) else: def EndEdit(self, row, col, grid): - oldval = self.Table.GetValueByName(row, self.Colname) - return self.EndEditInternal(row, col, grid, oldval) + oldval = self.Table.GetValueByName(row, self.Colname) + return self.EndEditInternal(row, col, grid, oldval) def SetSize(self, rect): self.CellControl.SetDimensions(rect.x + 1, rect.y,