From e887c43e0d6f1c372ee5da9a9c5bcc24777bfad8 Mon Sep 17 00:00:00 2001 From: ondrej Date: Tue, 19 Jun 2018 17:19:34 +0000 Subject: [PATCH] LCL: move EditingDone from TControl to TWinControl. It doesn't have a meaning in TControl git-svn-id: trunk@58339 - --- lcl/controls.pp | 8 ++++---- lcl/include/control.inc | 24 ------------------------ lcl/include/wincontrol.inc | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lcl/controls.pp b/lcl/controls.pp index b8bdc9aaac..e36516c764 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -1153,7 +1153,6 @@ type FOnDblClick: TNotifyEvent; FOnDragDrop: TDragDropEvent; FOnDragOver: TDragOverEvent; - FOnEditingDone: TNotifyEvent; FOnEndDock: TEndDragEvent; FOnEndDrag: TEndDragEvent; FOnMouseDown: TMouseEvent; @@ -1408,7 +1407,6 @@ type procedure MouseLeave; virtual; function DialogChar(var Message: TLMKey): boolean; virtual; procedure UpdateMouseCursor(X, Y: integer); - procedure DoEditingDone; virtual; protected procedure Changed; function GetPalette: HPalette; virtual; @@ -1512,7 +1510,6 @@ type property OnMouseWheelRight: TMouseWheelUpDownEvent read FOnMouseWheelRight write FOnMouseWheelRight; property OnStartDock: TStartDockEvent read FOnStartDock write FOnStartDock; property OnStartDrag: TStartDragEvent read FOnStartDrag write FOnStartDrag; - property OnEditingDone: TNotifyEvent read FOnEditingDone write FOnEditingDone; public FCompStyle: Byte; // DEPRECATED. Enables (valid) use of 'IN' operator (this // is a hack for speed. It will be replaced by the use of the widgetset @@ -1609,7 +1606,6 @@ type constructor Create(TheOwner: TComponent);override; destructor Destroy; override; procedure BeforeDestruction; override; - procedure EditingDone; procedure ExecuteDefaultAction; virtual; procedure ExecuteCancelAction; virtual; procedure BeginDrag(Immediate: Boolean; Threshold: Integer = -1); @@ -2007,6 +2003,7 @@ type FOnKeyDown: TKeyEvent; FOnKeyPress: TKeyPressEvent; FOnKeyUp: TKeyEvent; + FOnEditingDone: TNotifyEvent; FOnEnter: TNotifyEvent; FOnExit: TNotifyEvent; FOnUnDock: TUnDockEvent; @@ -2158,6 +2155,7 @@ type procedure DoGetDockCaption(AControl: TControl; var ACaption: String); virtual; protected // mouse and keyboard + procedure DoEditingDone; virtual; procedure DoEnter; virtual; procedure DoExit; virtual; function DoKeyDownBeforeInterface(var Message: TLMKey; IsRecurseCall: Boolean): Boolean; @@ -2223,6 +2221,7 @@ type property WindowHandle: HWND read FHandle write FHandle; // properties which are not supported by all descendents property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone; + property OnEditingDone: TNotifyEvent read FOnEditingDone write FOnEditingDone; property OnGetSiteInfo: TGetSiteInfoEvent read FOnGetSiteInfo write FOnGetSiteInfo; property OnGetDockCaption: TGetDockCaptionEvent read FOnGetDockCaption write FOnGetDockCaption; property ParentBackground: Boolean read GetParentBackground write SetParentBackground; @@ -2242,6 +2241,7 @@ type property DockManager: TDockManager read FDockManager write SetDockManager; property DockSite: Boolean read FDockSite write SetDockSite default False; property DoubleBuffered: Boolean read FDoubleBuffered write SetDoubleBuffered stored DoubleBufferedIsStored; + procedure EditingDone; property Handle: HWND read GetHandle write SetHandle; property IsFlipped: Boolean read FFlipped; property IsResizing: Boolean read GetIsResizing; diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 124a5548b4..573c2d6bdc 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -564,25 +564,6 @@ begin Perform(CM_CHANGED, 0, LParam(self)); end; -{------------------------------------------------------------------------------ - TControl.EditingDone - - Called when user has finished editing. This procedure can be used by data - links to commit the changes. - For example: - - When focus switches to another control (default) - - When user selected another item - It's totally up to the control, what events will commit. -------------------------------------------------------------------------------} -procedure TControl.EditingDone; -begin - if cfEditingDoneChanged in FControlFlags then - begin - DoEditingDone; - Exclude(FControlFlags, cfEditingDoneChanged); - end; -end; - procedure TControl.FontChanged(Sender: TObject); begin FParentFont := False; @@ -1745,11 +1726,6 @@ begin end; end; -procedure TControl.DoEditingDone; -begin - if Assigned(OnEditingDone) then OnEditingDone(Self); -end; - {------------------------------------------------------------------------------ TControl.DragOver ------------------------------------------------------------------------------} diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index a0e921f549..7ca19088d7 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -6644,6 +6644,30 @@ begin //DebugLn('[TWinControl.Destroy] END ',Name,':',ClassName); end; +{------------------------------------------------------------------------------ + TWinControl.EditingDone + + Called when user has finished editing. This procedure can be used by data + links to commit the changes. + For example: + - When focus switches to another control (default) + - When user selected another item + It's totally up to the control, what events will commit. +------------------------------------------------------------------------------} +procedure TWinControl.EditingDone; +begin + if cfEditingDoneChanged in FControlFlags then + begin + DoEditingDone; + Exclude(FControlFlags, cfEditingDoneChanged); + end; +end; + +procedure TWinControl.DoEditingDone; +begin + if Assigned(OnEditingDone) then OnEditingDone(Self); +end; + {------------------------------------------------------------------------------ Method: TWinControl.DoEnter Params: none