paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-13 09:33:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: DialogRes: remove Windows-dependent code and use the new ThemeServices.GetStockImage overload

Browse Source
This commit is contained in:
Ondrej Pokorny 2022-10-02 11:33:12 +02:00
parent 7e92650038
commit ff3965e8bc
2 changed files with 24 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lcl/dialogres.pas
View File

@ -5,9 +5,6 @@ unit DialogRes;
interface
uses
{$IFDEF MSWINDOWS}
Windows, ctypes,
{$ENDIF}
LCLType, Graphics, Themes, Controls, ImgList, InterfaceBase, LCLIntf, SysUtils, Classes;
type
@ -23,28 +20,6 @@ const
{idDialogShield } 'dialog_shield'
);
{$IFDEF MSWINDOWS}
{$EXTERNALSYM IDI_HAND}
IDI_HAND = MakeIntResourceW(32513);
{$EXTERNALSYM IDI_QUESTION}
IDI_QUESTION = MakeIntResourceW(32514);
{$EXTERNALSYM IDI_EXCLAMATION}
IDI_EXCLAMATION = MakeIntResourceW(32515);
{$EXTERNALSYM IDI_ASTERISK}
IDI_ASTERISK = MakeIntResourceW(32516);
{$EXTERNALSYM IDI_WINLOGO}
IDI_WINLOGO = MakeIntResourceW(32517);
{$EXTERNALSYM IDI_SHIELD}
IDI_SHIELD = MakeIntResourceW(32518);
{$EXTERNALSYM IDI_WARNING}
IDI_WARNING = IDI_EXCLAMATION;
{$EXTERNALSYM IDI_ERROR}
IDI_ERROR = IDI_HAND;
{$EXTERNALSYM IDI_INFORMATION}
IDI_INFORMATION = IDI_ASTERISK;
{$ENDIF MSWINDOWS}
type
TDialogImageList = class(TLCLGlyphs)
private
@ -65,11 +40,6 @@ implementation
{ $R forms/finddlgunit.lfm}
{ $R forms/replacedlgunit.lfm}
{$IFDEF MSWINDOWS}
Function LoadIconWithScaleDown( hinst:HINST; pszName:LPCWStr;cx:cint;cy:cint;var phico: HICON ):HRESULT; stdcall; external 'comctl32.dll' name 'LoadIconWithScaleDown';
{$ENDIF MSWINDOWS}
var
DialogImages: TDialogImageList;
@ -104,42 +74,36 @@ begin
end;
procedure TDialogImageList.LoadImage(AIndex: TDialogImage);
{$IFDEF MSWINDOWS}
const
WIN_ICONS: array[TDialogImage] of PWideChar = (IDI_WARNING, IDI_ERROR, IDI_INFORMATION, IDI_QUESTION, IDI_SHIELD);
var
R: TCustomImageListResolution;
IconHandle: HICON;
Ico: TRasterImage;
Icos: array of TRasterImage;
{$ENDIF}
Bmp: TCustomBitmap;
Bmps: array of TCustomBitmap;
Image, Mask: HBitmap;
begin
{$IFDEF MSWINDOWS}
if (WidgetSet.GetLCLCapability(lcNativeTaskDialog) = LCL_CAPABILITY_YES) and (WIN_ICONS[AIndex]<>nil) then
begin
Icos := [];
try
for R in Resolutions do
Bmps := [];
try
for R in Resolutions do
begin
if ThemeServices.GetStockImage(AIndex, R.Width, R.Height, Image, Mask) then
begin
if LoadIconWithScaleDown(0, WIN_ICONS[AIndex], R.Width, R.Height, IconHandle)=S_OK then
begin
Ico := TIcon.Create;
TIcon(Ico).Handle := IconHandle;
SetLength(Icos, Length(Icos)+1);
Icos[High(Icos)] := Ico;
end;
end;
if Length(Icos)>0 then
begin
fDialogIndexes[AIndex] := AddMultipleResolutions(Icos);
Exit;
end;
finally
for Ico in Icos do
Ico.Free;
Bmp := TBitmap.Create;
Bmp.SetHandles(Image, Mask);
SetLength(Bmps, Length(Bmps)+1);
Bmps[High(Bmps)] := Bmp;
end else
break; // goto default handling
end;
if Length(Bmps)>0 then
begin
fDialogIndexes[AIndex] := AddMultipleResolutions(Bmps);
Exit; // we are good to go
end;
finally
for Bmp in Bmps do
Bmp.Free;
end;
{$ENDIF}
// default handling
fDialogIndexes[AIndex] := GetImageIndex(DialogResName[AIndex]);
end;

4
lcl/lcltaskdialog.pas
View File

@ -415,10 +415,6 @@ function DefaultFont: TFont;
implementation
{$IFDEF WINDOWS}
Function LoadIconWithScaleDown( hinst:HINST; pszName:LPCWStr;cx:cint;cy:cint;var phico: HICON ):HRESULT; stdcall; external 'comctl32.dll' name 'LoadIconWithScaleDown';
{$ENDIF}
var
LDefaultFont: TFont;