mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-07 21:38:00 +02:00
lcl: add TWidgetset.AppSetIcon
win32, qt, carbon: implement AppSetIcon git-svn-id: trunk@15497 -
This commit is contained in:
parent
5353d4968f
commit
ce329d855d
@ -886,10 +886,10 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
function TApplication.GetIconHandle: HICON;
|
||||
begin
|
||||
if FIcon<>nil then
|
||||
if FIcon <> nil then
|
||||
Result := FIcon.Handle
|
||||
else
|
||||
Result:=0;
|
||||
Result := 0;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
|
@ -252,8 +252,7 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
function TCustomForm.GetIconHandle: HICON;
|
||||
begin
|
||||
//DebugLn('[TCustomForm.GetIconHandle] ',ClassName,' ',FIcon<>nil);
|
||||
if (FIcon<>nil) and (not Icon.Empty) then
|
||||
if (FIcon <> nil) and (not FIcon.Empty) then
|
||||
Result := FIcon.Handle
|
||||
else
|
||||
Result := Application.GetIconHandle;
|
||||
|
@ -49,9 +49,13 @@ begin
|
||||
if Assigned(ALoop) then ALoop;
|
||||
end;
|
||||
|
||||
procedure TWidgetSet.AppSetIcon(const AIcon: HICON);
|
||||
begin
|
||||
end;
|
||||
|
||||
procedure TWidgetSet.AppSetTitle(const ATitle: string);
|
||||
begin
|
||||
Debugln('TWidgetSet.AppSetTitle not implemented by ', ClassName);
|
||||
Debugln('TWidgetSet.AppSetTitle is not implemented by ', ClassName);
|
||||
end;
|
||||
|
||||
function TWidgetSet.LCLCapability(ACapability: TLCLCapability): PtrUInt;
|
||||
|
@ -91,6 +91,7 @@ type
|
||||
procedure AppMinimize; virtual; abstract;
|
||||
procedure AppRestore; virtual; abstract;
|
||||
procedure AppBringToFront; virtual; abstract;
|
||||
procedure AppSetIcon(const AIcon: HICON); virtual;
|
||||
procedure AppSetTitle(const ATitle: string); virtual;
|
||||
|
||||
function LCLPlatform: TLCLPlatform; virtual; abstract;
|
||||
|
@ -104,6 +104,7 @@ type
|
||||
procedure AppMinimize; override;
|
||||
procedure AppRestore; override;
|
||||
procedure AppBringToFront; override;
|
||||
procedure AppSetIcon(const AIcon: HICON); override;
|
||||
procedure AppSetTitle(const ATitle: string); override;
|
||||
|
||||
procedure AttachMenuToWindow(AMenuObject: TComponent); override;
|
||||
|
@ -974,6 +974,14 @@ begin
|
||||
OSError(SetFrontProcess(Proc), Self, SName, 'SetFrontProcess');
|
||||
end;
|
||||
|
||||
procedure TCarbonWidgetSet.AppSetIcon(const AIcon: HICON);
|
||||
begin
|
||||
if AIcon <> 0 then
|
||||
SetApplicationDockTileImage(TCarbonBitmap(AIcon).CGImage)
|
||||
else
|
||||
RestoreApplicationDockTileImage;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
Method: TCarbonWidgetSet.AppSetTitle
|
||||
Params: ATitle - New application title
|
||||
|
@ -93,6 +93,7 @@ type
|
||||
procedure AppMinimize; override;
|
||||
procedure AppRestore; override;
|
||||
procedure AppBringToFront; override;
|
||||
procedure AppSetIcon(const AIcon: HICON); override;
|
||||
procedure AppSetTitle(const ATitle: string); override;
|
||||
procedure AttachMenuToWindow(AMenuObject: TComponent); override;
|
||||
public
|
||||
|
@ -217,7 +217,7 @@ begin
|
||||
TQtMainWindow(Application.MainForm.Handle).BringToFront;
|
||||
end;
|
||||
|
||||
{procedure TQtWidgetSet.AppSetIcon(const AIcon: HICON);
|
||||
procedure TQtWidgetSet.AppSetIcon(const AIcon: HICON);
|
||||
var
|
||||
Icon: TQtIcon;
|
||||
begin
|
||||
@ -227,7 +227,7 @@ begin
|
||||
else
|
||||
QApplication_setWindowIcon(nil);
|
||||
end;
|
||||
}
|
||||
|
||||
|
||||
procedure TQtWidgetSet.AppSetTitle(const ATitle: string);
|
||||
var
|
||||
|
@ -184,6 +184,7 @@ type
|
||||
procedure AppProcessMessages; override;
|
||||
procedure AppWaitMessage; override;
|
||||
procedure AppTerminate; override;
|
||||
procedure AppSetIcon(const AIcon: HICON); override;
|
||||
procedure AppSetTitle(const ATitle: string); override;
|
||||
|
||||
function InitHintFont(HintFont: TObject): Boolean; Override;
|
||||
|
@ -390,6 +390,11 @@ begin
|
||||
Assert(False, 'Trace:TWin32WidgetSet.AppTerminate - Start');
|
||||
end;
|
||||
|
||||
procedure TWin32WidgetSet.AppSetIcon(const AIcon: HICON);
|
||||
begin
|
||||
SendMessage(Win32Widgetset.AppHandle, WM_SETICON, ICON_BIG, AIcon);
|
||||
end;
|
||||
|
||||
procedure TWin32WidgetSet.AppSetTitle(const ATitle: string);
|
||||
begin
|
||||
{$ifdef WindowsUnicodeSupport}
|
||||
|
Loading…
Reference in New Issue
Block a user