From 1ebd58d2a077be6caecf8af2190aac042d05def1 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Thu, 8 Mar 2018 05:56:38 +0100
Subject: [PATCH] remove BS + fix compilation broken

---
 src/ce_main.lfm     |  2 +-
 src/ce_main.pas     |  1 +
 src/ce_messages.lfm | 31 +++++++++++--------------------
 src/ce_messages.pas |  7 -------
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/ce_main.lfm b/src/ce_main.lfm
index 47ec57fe..dd5d2a3b 100644
--- a/src/ce_main.lfm
+++ b/src/ce_main.lfm
@@ -1470,7 +1470,7 @@ object CEMainForm: TCEMainForm
   OnResize = FormResize
   OnWindowStateChange = FormWindowStateChange
   ShowHint = True
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.2.0'
   object mainMenu: TMainMenu
     top = 1
     object MenuItem1: TMenuItem
diff --git a/src/ce_main.pas b/src/ce_main.pas
index bb5160bb..a8f847e3 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -2697,6 +2697,7 @@ begin
 end;
 
 procedure TCEMainForm.actEdFindExecute(Sender: TObject);
+var
   str: string;
 begin
   if fDoc.isNil then
diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm
index 54c67774..7936bc1c 100644
--- a/src/ce_messages.lfm
+++ b/src/ce_messages.lfm
@@ -47,7 +47,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
       ShowCaptions = True
       Wrapable = False
       object sep: TCEToolButton[0]
-        Left = 327
+        Left = 299
         Height = 28
         Hint = 'Clean filtered messages'
         Top = 0
@@ -56,7 +56,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object btnSelMisc: TCEToolButton[1]
-        Left = 290
+        Left = 262
         Hint = 'filter the other messages'
         Top = 0
         AutoSize = True
@@ -64,7 +64,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object button2: TCEToolButton[2]
-        Left = 285
+        Left = 257
         Height = 28
         Top = 0
         AutoSize = True
@@ -73,7 +73,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object btnSelApp: TCEToolButton[3]
-        Left = 204
+        Left = 176
         Hint = 'filter the messages related to Coedit'
         Top = 0
         AutoSize = True
@@ -81,7 +81,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object button4: TCEToolButton[4]
-        Left = 199
+        Left = 171
         Height = 28
         Top = 0
         AutoSize = True
@@ -90,7 +90,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object btnSelProj: TCEToolButton[5]
-        Left = 146
+        Left = 118
         Hint = 'filter the messages related to the active project'
         Top = 0
         AutoSize = True
@@ -98,7 +98,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object button6: TCEToolButton[6]
-        Left = 141
+        Left = 113
         Height = 28
         Top = 0
         AutoSize = True
@@ -107,7 +107,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object btnSelEdit: TCEToolButton[7]
-        Left = 95
+        Left = 67
         Hint = 'filter the messages related to the active editor'
         Top = 0
         AutoSize = True
@@ -115,7 +115,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object button8: TCEToolButton[8]
-        Left = 90
+        Left = 62
         Height = 28
         Top = 0
         AutoSize = True
@@ -124,7 +124,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object btnSelAll: TCEToolButton[9]
-        Left = 62
+        Left = 34
         Hint = 'don''t filter the messages'
         Top = 0
         AutoSize = True
@@ -157,7 +157,7 @@ inherited CEMessagesWidget: TCEMessagesWidget
         scaledSeparator = False
       end
       object sepCat: TCEToolButton[12]
-        Left = 57
+        Left = 29
         Height = 28
         Top = 0
         AutoSize = True
@@ -165,15 +165,6 @@ inherited CEMessagesWidget: TCEMessagesWidget
         Style = tbsDivider
         scaledSeparator = False
       end
-      object btnOpts: TCEToolButton[13]
-        Left = 29
-        Hint = 'edit the messages options'
-        Top = 0
-        AutoSize = True
-        OnClick = btnOptsClick
-        resourceName = 'WRENCH'
-        scaledSeparator = False
-      end
     end
   end
   inherited contextMenu: TPopupMenu
diff --git a/src/ce_messages.pas b/src/ce_messages.pas
index 9d5f407a..4f399935 100644
--- a/src/ce_messages.pas
+++ b/src/ce_messages.pas
@@ -64,7 +64,6 @@ type
 
   TCEMessagesWidget = class(TCEWidget, ICEEditableOptions, ICEDocumentObserver, ICEProjectObserver, ICEMessagesDisplay)
     btnClearCat: TCEToolButton;
-    btnOpts: TCEToolButton;
     sepCat: TCEToolButton;
     btnSelAll: TCEToolButton;
     btnSelApp: TCEToolButton;
@@ -78,7 +77,6 @@ type
     button8: TCEToolButton;
     List: TTreeView;
     TreeFilterEdit1: TTreeFilterEdit;
-    procedure btnOptsClick(Sender: TObject);
     procedure ListCustomDrawItem(Sender: TCustomTreeView; Node: TTreeNode;
       State: TCustomDrawState; var DefaultDraw: Boolean);
     procedure ListKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -617,11 +615,6 @@ begin
   Sender.Canvas.TextOut(x, rc.Top, node.Text);
   DefaultDraw := false;
 end;
-
-procedure TCEMessagesWidget.btnOptsClick(Sender: TObject);
-begin
-  getOptionsEditor.showOptionEditor(self as ICEEditableOptions);
-end;
 {$ENDREGION}
 
 {$REGION ICEEditableOptions ----------------------------------------------------}