From e9417175c170ac4dec715d9866843cf641e53cc7 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Wed, 11 Sep 2013 06:21:22 +0000
Subject: [PATCH] IDE: change PageComponent type from TComponent to
 TCustomPage. Eliminate type-casts etc.

git-svn-id: trunk@42731 -
---
 components/ideintf/componentreg.pas |  6 +++---
 ide/componentpalette.pas            | 18 +++---------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/components/ideintf/componentreg.pas b/components/ideintf/componentreg.pas
index 0dfad3f78f..26af80c55e 100644
--- a/components/ideintf/componentreg.pas
+++ b/components/ideintf/componentreg.pas
@@ -23,7 +23,7 @@ unit ComponentReg;
 interface
 
 uses
-  Classes, SysUtils, typinfo, Controls, LazarusPackageIntf, LCLProc;
+  Classes, SysUtils, typinfo, Controls, ComCtrls, LazarusPackageIntf, LCLProc;
 
 type
   TComponentPriorityCategory = (
@@ -91,7 +91,7 @@ type
   TBaseComponentPage = class
   private
     FItems: TList; // list of TRegisteredComponent
-    FPageComponent: TComponent;
+    FPageComponent: TCustomPage;
     FPageName: string;
     FPalette: TBaseComponentPalette;
     FPriority: TComponentPriority;
@@ -119,7 +119,7 @@ type
     property PageName: string read FPageName;
     property Palette: TBaseComponentPalette read FPalette;
     property Priority: TComponentPriority read FPriority write FPriority;
-    property PageComponent: TComponent read FPageComponent write FPageComponent;
+    property PageComponent: TCustomPage read FPageComponent write FPageComponent;
     property SelectButton: TComponent read FSelectButton write FSelectButton;
     property Visible: boolean read FVisible write SetVisible;
   end;
diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas
index d8a0991ee7..9bced4b5b9 100644
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@@ -644,11 +644,7 @@ var
     SortedCompList.Insert(i+1, aComponent);
   end;
 
-  {$IFDEF NEW_MAIN_IDE_TABS}
   procedure RemoveUnneededPage(aSheet: TCustomPage);
-  {$ELSE}
-  procedure RemoveUnneededPage(aSheet: TTabSheet);
-  {$ENDIF}
   var
     PageIndex: Integer;
     CurPage: TBaseComponentPage;
@@ -690,19 +686,11 @@ var
           BorderWidth := 0;
           HorzScrollBar.Visible := false;
           VertScrollBar.Increment := ComponentPaletteBtnHeight;
-          {$IFDEF NEW_MAIN_IDE_TABS}
-          Parent := TCustomPage(aCompPage.PageComponent);
-          {$ELSE}
-          Parent := TTabSheet(aCompPage.PageComponent);
-          {$ENDIF}
+          Parent := aCompPage.PageComponent;
         end;
       end else begin
         // move to the right position
-        {$IFDEF NEW_MAIN_IDE_TABS}
-        CurPageIndex := TCustomPage(aCompPage.PageComponent).PageIndex;
-        {$ELSE}
-        CurPageIndex := TTabSheet(aCompPage.PageComponent).PageIndex;
-        {$ENDIF}
+        CurPageIndex := aCompPage.PageComponent.PageIndex;
         if CurPageIndex<>aVisPageIndex then
           TCustomTabControl(FPageControl).Pages.Move(CurPageIndex, aVisPageIndex);
       end;
@@ -783,7 +771,7 @@ var
     CurScrollBox: TScrollBox;
   begin
     if aCompPage.Visible then begin
-      CurNoteBookPage := aCompPage.PageComponent as TCustomPage;
+      CurNoteBookPage := aCompPage.PageComponent;
       CurNoteBookPage.OnResize := @OnPageResize;
       CurScrollBox := CurNoteBookPage.Components[0] as TScrollBox;
       //DebugLn(['TComponentPalette.UpdateNoteBookButtons PAGE=',aCompPage.PageName,' PageIndex=',CurNoteBookPage.PageIndex]);