From 09ee5f1c56ba5d7a0268bf7b0237466e3bbfa509 Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Wed, 26 Aug 2020 14:36:34 +0000
Subject: [PATCH] LCL-Grids and VirtualTreeView: Move "FixDesignFontsPPI" for
 the basic components to "public". Declare as "override" for VTV.

git-svn-id: trunk@63831 -
---
 components/virtualtreeview/laz.virtualtrees.pas | 6 +++---
 lcl/grids.pas                                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/virtualtreeview/laz.virtualtrees.pas b/components/virtualtreeview/laz.virtualtrees.pas
index 60c437988c..f53efb16aa 100644
--- a/components/virtualtreeview/laz.virtualtrees.pas
+++ b/components/virtualtreeview/laz.virtualtrees.pas
@@ -2776,9 +2776,6 @@ type
     procedure EnsureNodeFocused(); virtual;
     function FindNodeInSelection(P: PVirtualNode; var Index: Integer; LowBound, HighBound: Integer): Boolean; virtual;
     procedure FinishChunkHeader(Stream: TStream; StartPos, EndPos: Integer); virtual;
-    {$IF LCL_FullVersion >= 2010000}
-    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual;
-    {$IFEND}
     procedure FontChanged(AFont: TObject); virtual; reintroduce;
     function GetBorderDimensions: TSize; virtual;
     function GetCheckImage(Node: PVirtualNode; ImgCheckType: TCheckType = ctNone;
@@ -3134,6 +3131,9 @@ type
     procedure EnsureNodeSelected(); virtual;
     function ExecuteAction(Action: TBasicAction): Boolean; override;
     procedure FinishCutOrCopy;
+    {$IF LCL_FullVersion >= 2010000}
+    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); override;
+    {$IFEND}
     procedure FlushClipboard;
     procedure FullCollapse(Node: PVirtualNode = nil);  virtual;
     procedure FullExpand(Node: PVirtualNode = nil); virtual;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index ccf7a91e7b..f674192a8b 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -1145,8 +1145,6 @@ type
     procedure RowHeightsChanged; virtual;
     procedure SaveContent(cfg: TXMLConfig); virtual;
     procedure SaveGridOptions(cfg: TXMLConfig); virtual;
-    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); override;
-    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
     procedure ScrollBarRange(Which:Integer; aRange,aPage,aPos: Integer);
     procedure ScrollBarPosition(Which, Value: integer);
     function  ScrollBarIsVisible(Which:Integer): Boolean;
@@ -1321,6 +1319,7 @@ type
 
     procedure EndUpdate(aRefresh: boolean = true);
     procedure EraseBackground(DC: HDC); override;
+    procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); override;
     function  Focused: Boolean; override;
     function  HasMultiSelection: Boolean;
     procedure HideSortArrow;
@@ -1339,6 +1338,7 @@ type
     function  MouseToGridZone(X,Y: Integer): TGridZone;
     procedure SaveToFile(FileName: string); virtual;
     procedure SaveToStream(AStream: TStream); virtual;
+    procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
     procedure SetFocus; override;
 
     property CursorState: TGridCursorState read FCursorState;