From 0eafcd014e48247a5d82ddc326dcbed89f244502 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 7 May 2018 09:11:24 +0000
Subject: [PATCH] jvcllaz: Move TJvTabBar and TJvTabBarXPPainter from
 JvCustomControls to JvPageComps package.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6393 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../design/JvCustomControls/JvCustomReg.pas   |  4 ++--
 .../design/JvPageComps/JvPageCompsReg.pas     |  2 ++
 .../examples/JvTabBar/JvTabBarDemo.lpi        |  2 +-
 components/jvcllaz/examples/JvTabBar/main.lfm |  6 ++---
 components/jvcllaz/packages/JvCustomLazR.lpk  | 24 +++++++------------
 components/jvcllaz/packages/JvPageCompsR.lpk  | 10 +++++++-
 .../JvTabBar.pas                              |  5 +++-
 .../JvTabBarXPPainter.pas                     |  0
 8 files changed, 29 insertions(+), 24 deletions(-)
 rename components/jvcllaz/run/{JvCustomControls => JvPageComps}/JvTabBar.pas (99%)
 rename components/jvcllaz/run/{JvCustomControls => JvPageComps}/JvTabBarXPPainter.pas (100%)

diff --git a/components/jvcllaz/design/JvCustomControls/JvCustomReg.pas b/components/jvcllaz/design/JvCustomControls/JvCustomReg.pas
index b4e036349..cb1b6048e 100644
--- a/components/jvcllaz/design/JvCustomControls/JvCustomReg.pas
+++ b/components/jvcllaz/design/JvCustomControls/JvCustomReg.pas
@@ -17,14 +17,14 @@ uses
   Classes, ImgList, Controls, LResources, PropEdits, GraphPropEdits, ComponentEditors,
   JvDsgnConsts,
   JvOutlookBar, JvOutlookBarEditors,
-  JvTabBar, JvTabBarXPPainter,
+//  JvTabBar, JvTabBarXPPainter,
   JvThumbImage, JvThumbnails, JvThumbViews,
   JvTimeLine, JvTMTimeLine, JvTimeLineEditor;
 
 procedure Register;
 begin
   RegisterComponents(RsPaletteJvcl, [
-    TJvTabBar, TJvModernTabBarPainter, TJvTabBarXPPainter,
+//    TJvTabBar, TJvModernTabBarPainter, TJvTabBarXPPainter,    // moved to PageComps
     TJvOutlookBar,
     TJvThumbView, TJvThumbnail, TJvThumbImage,
     TJvTimeLine,
diff --git a/components/jvcllaz/design/JvPageComps/JvPageCompsReg.pas b/components/jvcllaz/design/JvPageComps/JvPageCompsReg.pas
index 0a5cf4044..bc6b522ba 100644
--- a/components/jvcllaz/design/JvPageComps/JvPageCompsReg.pas
+++ b/components/jvcllaz/design/JvPageComps/JvPageCompsReg.pas
@@ -18,6 +18,7 @@ uses
   PropEdits, ComponentEditors,
   JvDsgnConsts,
   JvNavigationPane, JvNavPaneEditors,
+  JvTabBar, JvTabBarXPPainter,
   JvPageList, JvNotebookPageList,
   JvPageListEditors,
   JvPageListTreeView;
@@ -31,6 +32,7 @@ begin
     TJvNavigationPane,
     TJvNavIconButton,
     TJvNavPanelButton, TJvNavPanelHeader, TJvNavPanelDivider,
+    TJvTabBar, TJvModernTabBarPainter, TJvTabBarXPPainter,
     TJvOutlookSplitter,
     TJvNavPaneStyleManager, TJvNavPaneToolPanel
   ]);
diff --git a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi
index fdd338083..d67ffa0ee 100644
--- a/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi
+++ b/components/jvcllaz/examples/JvTabBar/JvTabBarDemo.lpi
@@ -26,7 +26,7 @@
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="JvCustomLazR"/>
+        <PackageName Value="JvPageCompsR"/>
       </Item1>
       <Item2>
         <PackageName Value="LCL"/>
diff --git a/components/jvcllaz/examples/JvTabBar/main.lfm b/components/jvcllaz/examples/JvTabBar/main.lfm
index 726000884..84a8b3e90 100644
--- a/components/jvcllaz/examples/JvTabBar/main.lfm
+++ b/components/jvcllaz/examples/JvTabBar/main.lfm
@@ -12,6 +12,7 @@ object Form1: TForm1
   LCLVersion = '1.9.0.0'
   object JvTabBar1: TJvTabBar
     Left = 0
+    Height = 24
     Top = 42
     Width = 614
     Visible = False
@@ -63,11 +64,10 @@ object Form1: TForm1
   end
   object Memo1: TMemo
     Left = 0
-    Height = 250
-    Top = 65
+    Height = 249
+    Top = 66
     Width = 614
     Align = alClient
-    BorderStyle = bsNone
     Font.CharSet = ANSI_CHARSET
     Font.Color = clBlack
     Font.Height = -11
diff --git a/components/jvcllaz/packages/JvCustomLazR.lpk b/components/jvcllaz/packages/JvCustomLazR.lpk
index c8a0f3d40..60e59944e 100644
--- a/components/jvcllaz/packages/JvCustomLazR.lpk
+++ b/components/jvcllaz/packages/JvCustomLazR.lpk
@@ -18,7 +18,7 @@
 "/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="4"/>
-    <Files Count="9">
+    <Files Count="7">
       <Item1>
         <Filename Value="..\run\JvCustomControls\JvTimeLine.pas"/>
         <UnitName Value="JvTimeLine"/>
@@ -32,29 +32,21 @@
         <UnitName Value="JvOutlookBar"/>
       </Item3>
       <Item4>
-        <Filename Value="..\run\JvCustomControls\JvTabBar.pas"/>
-        <UnitName Value="JvTabBar"/>
-      </Item4>
-      <Item5>
-        <Filename Value="..\run\JvCustomControls\JvTabBarXPPainter.pas"/>
-        <UnitName Value="JvTabBarXPPainter"/>
-      </Item5>
-      <Item6>
         <Filename Value="..\run\JvCustomControls\JvBaseThumbnail.pas"/>
         <UnitName Value="JvBaseThumbnail"/>
-      </Item6>
-      <Item7>
+      </Item4>
+      <Item5>
         <Filename Value="..\run\JvCustomControls\JvThumbImage.pas"/>
         <UnitName Value="JvThumbImage"/>
-      </Item7>
-      <Item8>
+      </Item5>
+      <Item6>
         <Filename Value="..\run\JvCustomControls\JvThumbnails.pas"/>
         <UnitName Value="JvThumbnails"/>
-      </Item8>
-      <Item9>
+      </Item6>
+      <Item7>
         <Filename Value="..\run\JvCustomControls\JvThumbViews.pas"/>
         <UnitName Value="JvThumbViews"/>
-      </Item9>
+      </Item7>
     </Files>
     <RequiredPkgs Count="2">
       <Item1>
diff --git a/components/jvcllaz/packages/JvPageCompsR.lpk b/components/jvcllaz/packages/JvPageCompsR.lpk
index 8974b8238..0ee154006 100644
--- a/components/jvcllaz/packages/JvPageCompsR.lpk
+++ b/components/jvcllaz/packages/JvPageCompsR.lpk
@@ -15,7 +15,7 @@
     <Description Value="Page style components of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)"/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="4"/>
-    <Files Count="4">
+    <Files Count="6">
       <Item1>
         <Filename Value="..\run\JvPageComps\JvNavigationPane.pas"/>
         <UnitName Value="JvNavigationPane"/>
@@ -32,6 +32,14 @@
         <Filename Value="..\run\JvPageComps\jvnotebookpagelist.pas"/>
         <UnitName Value="jvnotebookpagelist"/>
       </Item4>
+      <Item5>
+        <Filename Value="..\run\JvPageComps\JvTabBar.pas"/>
+        <UnitName Value="JvTabBar"/>
+      </Item5>
+      <Item6>
+        <Filename Value="..\run\JvPageComps\JvTabBarXPPainter.pas"/>
+        <UnitName Value="JvTabBarXPPainter"/>
+      </Item6>
     </Files>
     <RequiredPkgs Count="3">
       <Item1>
diff --git a/components/jvcllaz/run/JvCustomControls/JvTabBar.pas b/components/jvcllaz/run/JvPageComps/JvTabBar.pas
similarity index 99%
rename from components/jvcllaz/run/JvCustomControls/JvTabBar.pas
rename to components/jvcllaz/run/JvPageComps/JvTabBar.pas
index 2ca0a7ab4..58995e704 100644
--- a/components/jvcllaz/run/JvCustomControls/JvTabBar.pas
+++ b/components/jvcllaz/run/JvPageComps/JvTabBar.pas
@@ -33,7 +33,8 @@ interface
 uses
   LCLIntf, LCLType, LMessages, LCLVersion, Types,
   Graphics, Controls, Forms, ImgList, Menus, Buttons,
-  ExtCtrls, SysUtils, Classes, Contnrs, Themes;
+  ExtCtrls, SysUtils, Classes, Contnrs, Themes,
+  JvPageList;
 
 type
   TJvCustomTabBar = class;
@@ -46,6 +47,7 @@ type
   TJvGetModifiedEvent = procedure(Sender: TJvTabBarItem; var Modified: Boolean) of object;
   TJvGetEnabledEvent = procedure(Sender: TJvTabBarItem; var Enabled: Boolean) of object;
 
+  (*
   IPageList = interface
     ['{6BB90183-CFB1-4431-9CFD-E9A032E0C94C}']
     function CanChange(AIndex: Integer): Boolean;
@@ -57,6 +59,7 @@ type
     procedure MovePage(CurIndex, NewIndex: Integer);
     procedure PageCaptionChanged(Index: Integer; const NewCaption: string);
   end;
+  *)
 
   TJvTabBarItem = class(TCollectionItem)
   private
diff --git a/components/jvcllaz/run/JvCustomControls/JvTabBarXPPainter.pas b/components/jvcllaz/run/JvPageComps/JvTabBarXPPainter.pas
similarity index 100%
rename from components/jvcllaz/run/JvCustomControls/JvTabBarXPPainter.pas
rename to components/jvcllaz/run/JvPageComps/JvTabBarXPPainter.pas