From 355db1403aff5c7d061962f3ca21c62bcd8001f8 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 25 Sep 2019 20:39:54 +0200
Subject: [PATCH] Issue #144: Let grid editors call TExtForm.FixControls on
 their MainControl, to support Ctrl+Backspace there.

---
 source/extra_controls.pas | 18 ++++++++++++------
 source/grideditlinks.pas  |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/source/extra_controls.pas b/source/extra_controls.pas
index 646b6d88..f3c2a3f0 100644
--- a/source/extra_controls.pas
+++ b/source/extra_controls.pas
@@ -20,7 +20,7 @@ type
       constructor Create(AOwner: TComponent); override;
       procedure InheritFont(AFont: TFont);
       property HasSizeGrip: Boolean read GetHasSizeGrip write SetHasSizeGrip default False;
-      class procedure FixControls(FormOrFrame: TScrollingWincontrol);
+      class procedure FixControls(ParentComp: TComponent);
   end;
   // Memo replacement which accepts any line break format
   TLineNormalizingMemo = class(TMemo)
@@ -72,13 +72,12 @@ begin
 end;
 
 
-class procedure TExtForm.FixControls(FormOrFrame: TScrollingWincontrol);
+class procedure TExtForm.FixControls(ParentComp: TComponent);
 var
   i: Integer;
-  Cmp: TComponent;
-begin
-  for i:=0 to FormOrFrame.ComponentCount-1 do begin
-    Cmp := FormOrFrame.Components[i];
+
+  procedure ProcessSingleComponent(Cmp: TComponent);
+  begin
     if (Cmp is TButton) and (TButton(Cmp).Style = bsSplitButton) then begin
       // Work around broken dropdown (tool)button on Wine after translation:
       // https://sourceforge.net/p/dxgettext/bugs/80/
@@ -99,6 +98,13 @@ begin
       SHAutoComplete(TCustomEdit(Cmp).Handle, SHACF_AUTOAPPEND_FORCE_ON or SHACF_AUTOSUGGEST_FORCE_ON);
     end;
   end;
+begin
+  // Passed component itself may also be some control to be fixed
+  // e.g. TInplaceEditorLink.MainControl
+  ProcessSingleComponent(ParentComp);
+  for i:=0 to ParentComp.ComponentCount-1 do begin
+    ProcessSingleComponent(ParentComp.Components[i]);
+  end;
 end;
 
 
diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index 33c79414..f6640937 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -8,7 +8,7 @@ uses
   Windows, Forms, Graphics, Messages, VirtualTrees, ComCtrls, SysUtils, Classes,
   StdCtrls, ExtCtrls, CheckLst, Controls, Types, Dialogs, Menus, Mask, DateUtils, Math,
   dbconnection, dbstructures, apphelpers, texteditor, bineditor, gnugettext,
-  StrUtils, System.UITypes, SynRegExpr, Vcl.Themes;
+  StrUtils, System.UITypes, SynRegExpr, Vcl.Themes, extra_controls;
 
 type
   // Radio buttons and checkboxes which do not pass <Enter> key to their parent control
@@ -304,6 +304,7 @@ begin
   if Assigned(FMainControl) then begin
     FOldWindowProc := FMainControl.WindowProc;
     FMainControl.WindowProc := TempWindowProc;
+    TExtForm.FixControls(FMainControl);
   end;
   // Adjust editor position and allow repainting mainform  
   SetBounds(FCellTextBounds);