From 509f33e4d75be4df559768ceff9123ad9e7efa93 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 15 Apr 2022 22:56:31 +0000
Subject: [PATCH] jvcllaz: Fix compilation with Laz 1.8.4/FPC3.0.4

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8252 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/jvcllaz/run/JvCore/jvjvclutils.pas       | 2 ++
 components/jvcllaz/run/JvDB/jvdblookup.pas          | 6 ++++--
 components/jvcllaz/run/JvPageComps/jvpagelist.pas   | 7 ++++++-
 components/jvcllaz/run/JvPageComps/jvtabbar.pas     | 8 ++++----
 components/jvcllaz/run/JvTimeFramework/jvtfdays.pas | 4 ++++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/components/jvcllaz/run/JvCore/jvjvclutils.pas b/components/jvcllaz/run/JvCore/jvjvclutils.pas
index 0a7a9e866..447e3dbcd 100644
--- a/components/jvcllaz/run/JvCore/jvjvclutils.pas
+++ b/components/jvcllaz/run/JvCore/jvjvclutils.pas
@@ -901,10 +901,12 @@ const
 const
   SInvalidBitmap = 'Invalid bitmap';
 
+{$IF LCL_FullVersion > 1080400}
 function GetAppHandle: THandle;
 begin
   Result := Application.Handle;
 end;
+{$IFEND}
 
 (***************** NOT CONVERTED ***
 type
diff --git a/components/jvcllaz/run/JvDB/jvdblookup.pas b/components/jvcllaz/run/JvDB/jvdblookup.pas
index 634150d08..fd8686119 100644
--- a/components/jvcllaz/run/JvDB/jvdblookup.pas
+++ b/components/jvcllaz/run/JvDB/jvdblookup.pas
@@ -39,8 +39,8 @@ unit JvDBLookup;
 interface
 
 uses
-  Variants, Classes, Graphics, Controls, Forms, DB, DBCtrls,
-  LMessages, LCLType, LCLIntf, LCLProc, Themes,
+  LCLType, LCLIntf, LCLProc, LMessages, LCLVersion,
+  Variants, Classes, Graphics, Controls, Forms, DB, DBCtrls, Themes,
   JvThemes, JvDBUtils;
 
 const
@@ -535,7 +535,9 @@ type
     property LookupFormat;
     property LookupSource;
     property ParentColor;
+    {$IF LCL_FullVersion >= 2000000}
     property ParentDoubleBuffered;
+    {$IFEND}
     property ParentFont;
     property ParentShowHint;
     property PopupMenu;
diff --git a/components/jvcllaz/run/JvPageComps/jvpagelist.pas b/components/jvcllaz/run/JvPageComps/jvpagelist.pas
index 0a483d622..c08d3dcb0 100644
--- a/components/jvcllaz/run/JvPageComps/jvpagelist.pas
+++ b/components/jvcllaz/run/JvPageComps/jvpagelist.pas
@@ -31,7 +31,8 @@ unit JvPageList;
 interface
 
 uses
-  SysUtils, Classes, Graphics, Controls, Types, LMessages, LCLIntf, LCLType,
+  LMessages, LCLIntf, LCLType, LCLVersion,
+  SysUtils, Classes, Graphics, Controls, Types,
   JvComponent, JvThemes;
 
 type
@@ -214,7 +215,9 @@ type
     property OnMouseEnter;
     property OnMouseLeave;
     property OnParentColorChange;
+    {$IF LCL_FullVersion > 1080400}
     property ParentBackground default False;
+    {$ENDIF}
   end;
 
   TJvPageList = class(TJvCustomPageList)
@@ -271,7 +274,9 @@ type
     property OnMouseWheelUp;
     property OnResize;
     property OnStartDrag;
+    {$IF LCL_FullVersion > 1080400}
     property ParentBackground default False;
+    {$ENDIF}
   end;
 
 implementation
diff --git a/components/jvcllaz/run/JvPageComps/jvtabbar.pas b/components/jvcllaz/run/JvPageComps/jvtabbar.pas
index a92352033..adbea479d 100644
--- a/components/jvcllaz/run/JvPageComps/jvtabbar.pas
+++ b/components/jvcllaz/run/JvPageComps/jvtabbar.pas
@@ -1186,13 +1186,13 @@ begin
 
     if newHint <> inherited Hint then
     begin
-      // Without the next instruction the currently shown hint will not be replaced.
+      // Without the next instruction the currently shown hint will not be
+      // replaced when moving the mouse from tab to tab.
       Application.CancelHint;
 
-      // Move the new hint text to the control, but do not overwrite the
-      // own hint of the TabBar.
+      // Move the new hint text to the control, but keep the TabBar's own hint.
       inc(FHintLocked);
-      inherited Hint := newHint;
+      Hint := newHint;
       dec(FHintLocked);
 
       // Display the new hint
diff --git a/components/jvcllaz/run/JvTimeFramework/jvtfdays.pas b/components/jvcllaz/run/JvTimeFramework/jvtfdays.pas
index 0b76ff249..feef211cd 100644
--- a/components/jvcllaz/run/JvTimeFramework/jvtfdays.pas
+++ b/components/jvcllaz/run/JvTimeFramework/jvtfdays.pas
@@ -906,7 +906,9 @@ type
 
     // internal stuff
 //    procedure CMCtl3DChanged(var Msg: TLMessage); message CM_CTL3DCHANGED;
+    {$IF LCL_FullVersion >= 2000000}
     procedure WMGetDlgCode(var Msg: TLMGetDlgCode); message LM_GETDLGCODE;
+    {$ENDIF}
 //    procedure SetBorderStyle(Value: TBorderStyle);
     procedure SetTFVisibleScrollBars(Value: TJvTFVisibleScrollBars);
     procedure AlignScrollBars;
@@ -4439,10 +4441,12 @@ begin
 end;
 {$IFEND}
 
+{$IF LCL_FullVersion >= 2000000}
 procedure TJvTFDays.WMGetDlgCode(var Msg: TLMGetDlgCode);
 begin
   Msg.Result := DLGC_WANTALLKEYS or DLGC_WANTARROWS;
 end;
+{$IFEND}
 
 
                                             {