paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 09:09:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: lcltaskdialog: fix non-windows compilation

Browse Source 
git-svn-id: trunk@53013 -
This commit is contained in:
ondrej 2016-09-22 06:23:12 +00:00
parent cf81e01979
commit 5dfe53f3d2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/lcltaskdialog.pas
View File

@ -887,14 +887,18 @@ begin
IconBorder := 10 else IconBorder := 10 else
IconBorder := 24; IconBorder := 24;
if (LAZ_ICONS[aDialogIcon]<>'') or (WIN_ICONS[aDialogIcon]<>nil) then if (LAZ_ICONS[aDialogIcon]<>'') {$IFDEF MSWINDOWS}or (WIN_ICONS[aDialogIcon]<>nil){$ENDIF} then
begin begin
Image := TImage.Create(Dialog.Form); Image := TImage.Create(Dialog.Form);
Image.Parent := Par; Image.Parent := Par;
{$IFDEF MSWINDOWS}
if WIN_ICONS[aDialogIcon]<>nil then if WIN_ICONS[aDialogIcon]<>nil then
IconHandle := LoadIcon(0,WIN_ICONS[aDialogIcon]) IconHandle := LoadIcon(0,WIN_ICONS[aDialogIcon])
else else
IconHandle := 0; IconHandle := 0;
{$ELSE}
IconHandle := 0;
{$ENDIF}
if IconHandle<>0 then if IconHandle<>0 then
Image.Picture.Icon.Handle := IconHandle Image.Picture.Icon.Handle := IconHandle
else if LAZ_ICONS[aDialogIcon]<>'' then else if LAZ_ICONS[aDialogIcon]<>'' then
@ -1081,7 +1085,7 @@ begin
if XB<>0 then if XB<>0 then
AddBevel else AddBevel else
inc(Y,16); inc(Y,16);
if (LAZ_FOOTERICONS[aFooterIcon]<>'') or (WIN_FOOTERICONS[aFooterIcon]<>nil) then if (LAZ_FOOTERICONS[aFooterIcon]<>'') {$IFDEF MSWINDOWS}or (WIN_FOOTERICONS[aFooterIcon]<>nil){$ENDIF} then
begin begin
Image := TImage.Create(Dialog.Form); Image := TImage.Create(Dialog.Form);
Image.Parent := Par; Image.Parent := Par;
@ -1090,6 +1094,7 @@ begin
Bmp := TBitmap.Create; Bmp := TBitmap.Create;
try try
Bmp.Transparent := true; Bmp.Transparent := true;
{$IFDEF MSWINDOWS}
if WIN_FOOTERICONS[aFooterIcon]<>nil then if WIN_FOOTERICONS[aFooterIcon]<>nil then
begin begin
IconHandle := LoadIcon(0,WIN_FOOTERICONS[aFooterIcon]); IconHandle := LoadIcon(0,WIN_FOOTERICONS[aFooterIcon]);
@ -1101,7 +1106,8 @@ begin
Bmp.Height := Ico.Height shr 1; Bmp.Height := Ico.Height shr 1;
end; end;
end; end;
if (Ico=nil) and(LAZ_FOOTERICONS[aFooterIcon]<>'') then {$ENDIF}
if (Ico=nil) and (LAZ_FOOTERICONS[aFooterIcon]<>'') then
begin begin
Pic := TPortableNetworkGraphic.Create; Pic := TPortableNetworkGraphic.Create;
Pic.LoadFromResourceName(HINSTANCE, LAZ_FOOTERICONS[aFooterIcon]); Pic.LoadFromResourceName(HINSTANCE, LAZ_FOOTERICONS[aFooterIcon]);
@ -1117,8 +1123,12 @@ begin
if Pic<>nil then if Pic<>nil then
Bmp.Canvas.StretchDraw(Rect(0, 0, Bmp.Width, Bmp.Height), Pic) Bmp.Canvas.StretchDraw(Rect(0, 0, Bmp.Width, Bmp.Height), Pic)
else else
begin
{$IFDEF MSWINDOWS}
DrawIconEx(Bmp.Canvas.Handle,0,0,Ico.Handle,Bmp.Width,Bmp.Height,0, DrawIconEx(Bmp.Canvas.Handle,0,0,Ico.Handle,Bmp.Width,Bmp.Height,0,
Bmp.Canvas.Brush.{%H-}Handle,DI_NORMAL); Bmp.Canvas.Brush.{%H-}Handle,DI_NORMAL);
{$ENDIF}
end;
Image.Picture.Bitmap := Bmp; Image.Picture.Bitmap := Bmp;
Image.SetBounds(24,Y,Bmp.Width,Bmp.Height); Image.SetBounds(24,Y,Bmp.Width,Bmp.Height);
X := 40+Bmp.Width; X := 40+Bmp.Width;