From 9bc1db76ca4da0691b0b07b593e097376d208e4d Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Tue, 8 Sep 2015 00:07:46 +0200
Subject: [PATCH] remove context menu from the search widget

---
 src/ce_search.lfm | 12 ++++++------
 src/ce_search.pas | 26 +-------------------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/ce_search.lfm b/src/ce_search.lfm
index acae4193..be438aa1 100644
--- a/src/ce_search.lfm
+++ b/src/ce_search.lfm
@@ -130,7 +130,7 @@ inherited CESearchWidget: TCESearchWidget
         Caption = 'Options'
         ClientHeight = 77
         ClientWidth = 382
-        TabOrder = 3
+        TabOrder = 4
         object chkWWord: TCheckBox
           Left = 8
           Height = 23
@@ -147,7 +147,7 @@ inherited CESearchWidget: TCESearchWidget
           Top = 24
           Width = 75
           Caption = 'backward'
-          TabOrder = 2
+          TabOrder = 1
         end
         object chkFromCur: TCheckBox
           Left = 8
@@ -157,7 +157,7 @@ inherited CESearchWidget: TCESearchWidget
           Caption = 'from cursor'
           Checked = True
           State = cbChecked
-          TabOrder = 3
+          TabOrder = 2
         end
         object chkCaseSens: TCheckBox
           Left = 128
@@ -165,7 +165,7 @@ inherited CESearchWidget: TCESearchWidget
           Top = 0
           Width = 95
           Caption = 'case sensitive'
-          TabOrder = 4
+          TabOrder = 3
         end
         object chkPrompt: TCheckBox
           Left = 128
@@ -173,7 +173,7 @@ inherited CESearchWidget: TCESearchWidget
           Top = 24
           Width = 64
           Caption = 'prompt'
-          TabOrder = 1
+          TabOrder = 4
         end
         object chkRegex: TCheckBox
           Left = 128
@@ -230,7 +230,7 @@ inherited CESearchWidget: TCESearchWidget
           4766E69547FFE69A4EFFE2904122FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
           FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
         }
-        TabOrder = 4
+        TabOrder = 3
       end
       object Panel1: TPanel[5]
         Left = 4
diff --git a/src/ce_search.pas b/src/ce_search.pas
index e913fcdc..ef14237e 100644
--- a/src/ce_search.pas
+++ b/src/ce_search.pas
@@ -86,10 +86,6 @@ type
     procedure docFocused(aDoc: TCESynMemo);
     procedure docChanged(aDoc: TCESynMemo);
     //
-    function contextName: string; override;
-    function contextActionCount: integer; override;
-    function contextAction(index: integer): TAction; override;
-    //
     procedure actFindNextExecute(sender: TObject);
     procedure actReplaceNextExecute(sender: TObject);
   end;
@@ -171,6 +167,7 @@ constructor TCESearchWidget.Create(aOwner: TComponent);
 var
   fname: string;
 begin
+  inherited;
   fActFindNext := TAction.Create(self);
   fActFindNext.Caption := 'Find';
   fActFindNext.OnExecute := @actFindNextExecute;
@@ -180,7 +177,6 @@ begin
   fActReplaceAll := TAction.Create(self);
   fActReplaceAll.Caption := 'Replace all';
   fActReplaceAll.OnExecute := @actReplaceAllExecute;
-  inherited;
   //
   fSearchMru := TCEMruList.Create;
   fReplaceMru:= TCEMruList.Create;
@@ -220,26 +216,6 @@ end;
 {$ENDREGION}
 
 {$REGION ICEContextualActions---------------------------------------------------}
-function TCESearchWidget.contextName: string;
-begin
-  exit('Search');
-end;
-
-function TCESearchWidget.contextActionCount: integer;
-begin
-  exit(3);
-end;
-
-function TCESearchWidget.contextAction(index: integer): TAction;
-begin
-  case index of
-    0: exit(fActFindNext);
-    1: exit(fActReplaceNext);
-    2: exit(fActReplaceAll);
-    else exit(nil);
-  end;
-end;
-
 function TCESearchWidget.getOptions: TSynSearchOptions;
 begin
   result := [];