From 6f2a1d05b73f3771c13a13d586e17f4ddc7f24cd Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Sun, 27 Dec 2015 20:34:22 +0000
Subject: [PATCH] merge r51050: ideintf, ide: change result type of
 TMainIDEBase.GetMainBar from TComponent to TForm. (needed for r51051 and
 r51055 #c91d201731)

git-svn-id: branches/fixes_1_6@51057 -
---
 components/ideintf/lazideintf.pas | 2 +-
 ide/mainbase.pas                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ideintf/lazideintf.pas b/components/ideintf/lazideintf.pas
index 5525bba824..58cef43cdb 100644
--- a/components/ideintf/lazideintf.pas
+++ b/components/ideintf/lazideintf.pas
@@ -297,7 +297,7 @@ type
     property ToolStatus: TLazToolStatus read FToolStatus write SetToolStatus;
 
     // the main window with the IDE menu
-    function GetMainBar: TComponent; virtual; abstract;
+    function GetMainBar: TForm; virtual; abstract;
     property MainBarSubTitle: string read FMainBarSubTitle write SetMainBarSubTitle;
 
     // find file
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 4922995061..edbffe42e5 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -137,7 +137,7 @@ type
     procedure StartIDE; virtual; abstract;
     destructor Destroy; override;
     procedure CreateOftenUsedForms; virtual; abstract;
-    function GetMainBar: TComponent; override;
+    function GetMainBar: TForm; override;
     procedure SetRecentProjectFilesMenu;
     procedure SetRecentFilesMenu;
     function BeginCodeTool(var ActiveSrcEdit: TSourceEditor;
@@ -705,7 +705,7 @@ begin
   ActiveUnitInfo:=AnUnitInfo;
 end;
 
-function TMainIDEBase.GetMainBar: TComponent;
+function TMainIDEBase.GetMainBar: TForm;
 begin
   Result:=MainIDEBar;
 end;