From 78b42debffec4666c8481f90a679e228925cb445 Mon Sep 17 00:00:00 2001 From: zeljan1 Date: Fri, 16 Sep 2022 18:00:17 +0200 Subject: [PATCH] Revert "Merge branch 'main' of https://gitlab.com/freepascal.org/lazarus/lazarus into main" This reverts commit 9c4ae10819a2415f26d46469a7af437bbd98aa70, reversing changes made to 0e040a0d776b8779f8ada6a815ffdfc42aab3eb6. --- components/fpdebug/fpdbgdarwinclasses.pas | 2 +- docs/xml/lcl/stdctrls.xml | 53 ++++------------------- lcl/dbgrids.pas | 5 --- 3 files changed, 10 insertions(+), 50 deletions(-) diff --git a/components/fpdebug/fpdbgdarwinclasses.pas b/components/fpdebug/fpdbgdarwinclasses.pas index 547e06a7d3..2b33748d98 100644 --- a/components/fpdebug/fpdbgdarwinclasses.pas +++ b/components/fpdebug/fpdbgdarwinclasses.pas @@ -563,7 +563,7 @@ begin result := FThreadState64.__rsp; end; -procedure TDbgDarwinThread.SetInstructionPointerRegisterValue(AValue: TDbgPtr); +procedure TDbgDarwinThread.SetSetInstructionPointerRegisterValue(AValue: TDbgPtr); begin end; diff --git a/docs/xml/lcl/stdctrls.xml b/docs/xml/lcl/stdctrls.xml index 694fe3f676..68ae31b680 100644 --- a/docs/xml/lcl/stdctrls.xml +++ b/docs/xml/lcl/stdctrls.xml @@ -9858,36 +9858,19 @@ Performs actions needed when a click message is handled for the control. Click is an overridden method in TButtonControl. Click calls the DoOnChange method which signals the OnEditingDone and OnChange event handlers (when -assigned). +assigned). Click calls the inherited method prior to exit.

-Click calls the inherited method prior to exit. The inherited method (in -TControl) signals either the OnClick event handler or the OnExecute handler -in the Action. OnClick is used when Action has not been assigned, or when -OnClick contains a handler routine that differs from the one assigned to the -OnExecute handler in the Action. -

-

-Click can be called in two different usage scenarios. If standard click -events have been enabled in ControlStyle, it is called when the left mouse -button is released. It can also be called from a private LM_CLICKED message -handler in the control when standard click events are not enabled in -ControlStyle. This avoids a duplicate click notification when csClickEvents -is enabled in ControlStyle and Click is handled when the WMLButtonUp method -is executed. +Click is called when the LM_CLICKED message is handled for the control. It +occurs when click events are not enabled in ControlStyle and +ControlState.

TControl.Click -TControl.Action TControl.OnEditingDone -TControl.WMLButtonUp -TControl.ControlStyle -TControl.ControlState -LM_CLICKED -TBasicAction.OnExecute @@ -11106,37 +11089,19 @@ handler. Use ClicksDisabled is control the event handler signalled.

Click is an overridden method in TCustomCheckBox. It -performs actions needed when the value in the Checked or State property is -changed for the control, whether by mouse click or setting the value in -program code. -

-

-TCustomCheckBox re-implements the method from the TButtonControl ancestor to -ignore the mouse click event. It has an empty implementation, and does not call the inherited method. -

-

-In TCustomCheckBox, the click action may be handled in two different ways. -The action may be performed (in TControl) when the left mouse button is -released and standard click events are enabled in ControlStyle. The click -action may be performed in DoClickOnChange (by calling the inherited Click -method) when the value in State is changed and ClicksDisabled is False. -

-

-This avoids a duplicate click notification when csClickEvents is enabled in -ControlStyle and Click is handled when the WMLButtonUp method is executed, or -when the click is triggered by an associated Action. +ignores mouse up event notifications, and does not call the inherited method. +The click action is performed either in the DoClickOnChange method when the +ClicksDisabled property is False, or when the LM_CLICKED message is +handled for the control and click events are not enabled in ControlStyle and +ControlState.

- - TControl.Click -TControl.Action TControl.ControlState TControl.ControlStyle -TControl.WMLButtonUp diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas index 1c56df5fb5..4560e77e88 100644 --- a/lcl/dbgrids.pas +++ b/lcl/dbgrids.pas @@ -4630,12 +4630,7 @@ begin FList.Insert(Index, Bookmark); FGrid.Invalidate; end else - begin FDataset.FreeBookmark(Bookmark); - {$ifndef noautomatedbookmark} - SetLength(TBookmark(Bookmark),0); // decrease reference count - {$endif} - end; end; end;