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

qt: correctly handle HICON = 0

Browse Source 
git-svn-id: trunk@15502 -
This commit is contained in:
paul 2008-06-21 13:24:37 +00:00
parent 453ea8d582
commit f4e7288ff8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/interfaces/qt/qtobject.inc
View File

@ -219,13 +219,17 @@ end;
procedure TQtWidgetSet.AppSetIcon(const AIcon: HICON); procedure TQtWidgetSet.AppSetIcon(const AIcon: HICON);
var var
Icon: TQtIcon; DoDestroyIcon: Boolean;
Icon: QIconH;
begin begin
Icon := TQtIcon(AIcon); DoDestroyIcon := AIcon = 0;
if Icon <> nil then if DoDestroyIcon then
QApplication_setWindowIcon(Icon.Handle) Icon := QIcon_create()
else else
QApplication_setWindowIcon(nil); Icon := TQtIcon(AIcon).Handle;
QApplication_setWindowIcon(Icon);
if DoDestroyIcon then
QIcon_destroy(Icon);
end; end;

7
lcl/interfaces/qt/qtwidgets.pas
View File

@ -2751,8 +2751,15 @@ begin
end; end;
procedure TQtWidget.setWindowIcon(AIcon: QIconH); procedure TQtWidget.setWindowIcon(AIcon: QIconH);
var
DestroyIcon: Boolean;
begin begin
DestroyIcon := AIcon = nil;
if DestroyIcon then
AIcon := QIcon_create();
QWidget_setWindowIcon(Widget, AIcon); QWidget_setWindowIcon(Widget, AIcon);
if DestroyIcon then
QIcon_destroy(AIcon);
end; end;
function TQtWidget.windowFlags: QtWindowFlags; function TQtWidget.windowFlags: QtWindowFlags;