From 3b2bc7db66832a0571f8f9c9a21c57c6d9b3b458 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 8 Jul 2017 11:59:47 +0000
Subject: [PATCH] spktoolbar: Fix compilation under Laz <1.8

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5980 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/spktoolbar/demos/actions/unit1.lfm |   8 +-------
 .../spktoolbar/demos/basic/Project1.res       | Bin 138932 -> 138936 bytes
 .../designtime/spkte_AppearanceEditor.pas     |   4 ++--
 .../designtime/spkte_EditWindow.pas           |   6 +++---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/components/spktoolbar/demos/actions/unit1.lfm b/components/spktoolbar/demos/actions/unit1.lfm
index 49b90b9bc..5ba93b13a 100644
--- a/components/spktoolbar/demos/actions/unit1.lfm
+++ b/components/spktoolbar/demos/actions/unit1.lfm
@@ -9,7 +9,7 @@ object Form1: TForm1
   Menu = MainMenu
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
-  LCLVersion = '1.7'
+  LCLVersion = '1.6.4.0'
   object ToolBar1: TToolBar
     Left = 0
     Height = 26
@@ -128,8 +128,6 @@ object Form1: TForm1
     Top = 26
     Width = 585
     Appearance.Tab.TabHeaderFont.Color = 9126421
-    Appearance.Tab.TabHeaderFont.Height = -13
-    Appearance.Tab.TabHeaderFont.Name = 'Calibri'
     Appearance.Tab.BorderColor = 14922381
     Appearance.Tab.GradientFromColor = 16115934
     Appearance.Tab.GradientToColor = 15587527
@@ -139,14 +137,10 @@ object Form1: TForm1
     Appearance.Pane.BorderLightColor = 16315117
     Appearance.Pane.CaptionBgColor = 15849922
     Appearance.Pane.CaptionFont.Color = 11168318
-    Appearance.Pane.CaptionFont.Height = -12
-    Appearance.Pane.CaptionFont.Name = 'Calibri'
     Appearance.Pane.GradientFromColor = 16115934
     Appearance.Pane.GradientToColor = 15587527
     Appearance.Pane.GradientType = bkConcave
     Appearance.Element.CaptionFont.Color = 9126421
-    Appearance.Element.CaptionFont.Height = -12
-    Appearance.Element.CaptionFont.Name = 'Calibri'
     Appearance.Element.IdleFrameColor = 14727067
     Appearance.Element.IdleGradientFromColor = 15653832
     Appearance.Element.IdleGradientToColor = 15323324
diff --git a/components/spktoolbar/demos/basic/Project1.res b/components/spktoolbar/demos/basic/Project1.res
index 877868cb4251927ab961b2295948c0d753ecb7cd..4ff746d8ad795966bb1af52e6626a7a90a04cb91 100644
GIT binary patch
delta 49
zcmdn8mt)6XjtL5kb_*35*(38yiyR9ICTlR-uqtGv7Nu@ZVH9U=u3>AhVPo80!^UJG
F0RWvE4-WtU

delta 43
zcmdn7mt)IbjtL5kmJ1ab*&PcC{1S6hCu=a;Y|dm9XKk)$Yp-Wx++NSdWGMjvKxqvk

diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
index 434d47bc8..80d11f80e 100644
--- a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
+++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas
@@ -1373,11 +1373,11 @@ var
   w, h: Integer;
 begin
   // Use correct size of color picker icon
-  if Monitor.PixelsPerInch >= 180 then begin
+  if ScreenInfo.PixelsPerInchY >= 180 then begin
     imglist := Images_200;
     m := 2.0;
   end
-  else if Monitor.PixelsPerInch >= 135 then begin
+  else if ScreenInfo.PixelsPerInchY >= 135 then begin
     imglist := Images_150;
     m := 1.5;
   end
diff --git a/components/spktoolbar/designtime/spkte_EditWindow.pas b/components/spktoolbar/designtime/spkte_EditWindow.pas
index 6a2e6b6e0..a0d9bde8b 100644
--- a/components/spktoolbar/designtime/spkte_EditWindow.pas
+++ b/components/spktoolbar/designtime/spkte_EditWindow.pas
@@ -1158,12 +1158,12 @@ end;
 procedure TfrmEditWindow.UpdatePPI;
 begin
   tbToolbar.Images := nil;
-  if Monitor.PixelsPerInch >= 180 then begin
+  if ScreenInfo.PixelsPerInchY >= 180 then begin
     ActionList.Images := ilActionImages_200;
     tbToolbar.Images := ilActionImages_200;
     tvStructure.Images := ilTreeImages_200;
   end else
-  if Monitor.PixelsPerInch >= 135 then begin
+  if ScreenInfo.PixelsPerInchY >= 135 then begin
     ActionList.Images := ilActionImages_150;
     tbToolbar.Images := ilActionImages_150;
     tvStructure.Images := ilTreeImages_150;
@@ -1172,7 +1172,7 @@ begin
     tbToolbar.Images := ilActionImages;
     tvStructure.Images := ilTreeImages;
   end;
-//  tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
+  tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
 //  tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8;
 end;