From dfaea13f4bd61f2f627fdb253804e2ae87603e13 Mon Sep 17 00:00:00 2001 From: wp Date: Sat, 27 Feb 2021 21:07:56 +0000 Subject: [PATCH] LCL/ShellCtrls: Temporarily deactivate changes in ShellCtrls made by r64575 #e32b62e6b4. Issue #38517. git-svn-id: trunk@64679 - --- lcl/shellctrls.pas | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lcl/shellctrls.pas b/lcl/shellctrls.pas index 43029c0127..dd1338f064 100644 --- a/lcl/shellctrls.pas +++ b/lcl/shellctrls.pas @@ -84,7 +84,7 @@ type procedure DoSelectionChanged; override; procedure DoAddItem(const ABasePath: String; const AFileInfo: TSearchRec; var CanAdd: Boolean); function CanExpand(Node: TTreeNode): Boolean; override; - +(* {$ifdef mswindows} private FBuiltinIconSize: TSize; @@ -92,6 +92,7 @@ type function DrawBuiltInIcon(ANode: TTreeNode; ARect: TRect): TSize; override; function GetBuiltinIconSize: TSize; override; {$endif} +*) public { Basic methods } @@ -375,7 +376,8 @@ procedure Register; implementation {$ifdef windows} -uses Windows, ShellApi; +//uses Windows, ShellApi; +uses Windows; {$endif} const @@ -996,6 +998,7 @@ begin FOnAddItem(Self, ABasePath, AFileInfo, CanAdd); end; +(* {$ifdef mswindows} { Extracts the windows shell icon of the specified file. } function GetShellIcon(const AFileName: WideString): TIcon; @@ -1054,6 +1057,7 @@ begin Result := Types.Size(0, 0); end; {$endif} +*) function TCustomShellTreeView.GetPathFromNode(ANode: TTreeNode): string; begin