From 46ff69fe2d9d32c2f39c2ffc67d62773ee67526f Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 7 Dec 2016 17:41:09 +0000
Subject: [PATCH] jvcllaz: Fix Linux issues (CommCtrl)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5448 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/JvNavigationPane/JvNavPaneDemo.lpi        | 10 +++-------
 .../JvNavigationPane/JvNavPaneDemoMainForm.pas         |  2 --
 components/jvcllaz/packages/JvPageCompsR.lpk           |  2 +-
 components/jvcllaz/run/JvCore/JvConsts.pas             |  3 +++
 components/jvcllaz/run/JvCore/JvJVCLUtils.pas          |  6 +++---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi
index 2e811e40c..c0c4db555 100644
--- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi
+++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <MainUnit Value="0"/>
-      <XPManifest>
-        <TextName Value="CompanyName.ProductName.AppName"/>
-        <TextDesc Value="Your application description."/>
-      </XPManifest>
     </General>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
@@ -25,7 +21,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="2">
@@ -51,6 +47,7 @@
         <ComponentName Value="JvNavPaneDemoMainFrm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <CursorPos X="3" Y="11"/>
         <UsageCount Value="22"/>
@@ -84,7 +81,6 @@
       </Unit5>
       <Unit6>
         <Filename Value="..\..\run\JvPageComps\JvNavigationPane.pas"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <TopLine Value="31"/>
         <CursorPos X="61" Y="50"/>
diff --git a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas
index f31274029..e24db0207 100644
--- a/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas
+++ b/components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas
@@ -65,8 +65,6 @@ var
   JvNavPaneDemoMainFrm: TJvNavPaneDemoMainFrm;
 
 implementation
-uses
-  CommCtrl;
 
 procedure TJvNavPaneDemoMainFrm.FormCreate(Sender: TObject);
 var
diff --git a/components/jvcllaz/packages/JvPageCompsR.lpk b/components/jvcllaz/packages/JvPageCompsR.lpk
index f00a17c78..8d0c0d460 100644
--- a/components/jvcllaz/packages/JvPageCompsR.lpk
+++ b/components/jvcllaz/packages/JvPageCompsR.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\run\JvPageComps;..\run\JvStdCtrls"/>
+        <OtherUnitFiles Value="..\run\JvPageComps"/>
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvPageComps"/>
       </SearchPaths>
     </CompilerOptions>
diff --git a/components/jvcllaz/run/JvCore/JvConsts.pas b/components/jvcllaz/run/JvCore/JvConsts.pas
index 995f8220d..26f3e49a1 100644
--- a/components/jvcllaz/run/JvCore/JvConsts.pas
+++ b/components/jvcllaz/run/JvCore/JvConsts.pas
@@ -207,6 +207,9 @@ const
 
   DT_PATH_ELLIPSIS = $4000;
 
+  COLORONCOLOR = 3;
+  STRETCH_DELETESCANS = COLORONCOLOR;
+
 
 const
   KeyboardShiftStates = [ssShift, ssAlt, ssCtrl];
diff --git a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
index 292f2b65c..d0687b8ff 100644
--- a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
+++ b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
@@ -855,11 +855,11 @@ function ReplaceImageListReference(This: TComponent; NewReference: TCustomImageL
 implementation
 
 uses
-  sysutils, LCLIntf,
+  sysutils, LCLIntf, GraphType, Math, Forms,
  {$IFDEF MSWINDOWS}
   CommCtrl,
  {$ENDIF}
-  math, JvConsts, JvJCLUtils;
+  JvConsts, JvJCLUtils;
   (********************
   SysConst,
   Consts,
@@ -2057,7 +2057,7 @@ begin
      {$IFDEF MSWINDOWS}
       ImageList_Draw(Images.Handle, Index, Handle, 0, 0, ILD_MASK);
      {$ELSE}
-      ImageList_Draw ????
+      Images.GetBitmap(Index, Bmp, gdeDisabled);    // to do: test this
      {$ENDIF}
     end;
     Bmp.Monochrome := True;