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

LCL-GTK2: Call gtk_status_icon_set_tooltip_text() instead of gtk_status_icon_set_tooltip() for TrayIcon.Hint when FPC trunk is used. Issue #39194.

Browse Source 
git-svn-id: trunk@65439 -
This commit is contained in:
juha 2021-07-10 20:33:26 +00:00
parent 81a1c1e4f2
commit 5d0cd2d8ed
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/gtk2/gtk2trayicon.inc
View File

@ -383,7 +383,11 @@ begin
begin begin
FStatusIcon := gtk_status_icon_new(); FStatusIcon := gtk_status_icon_new();
gtk_status_icon_set_from_pixbuf(FStatusIcon, {%H-}PGdkPixbuf(FTrayIcon.Icon.Handle)); gtk_status_icon_set_from_pixbuf(FStatusIcon, {%H-}PGdkPixbuf(FTrayIcon.Icon.Handle));
{$IF FPC_FULLVERSION>30300}
gtk_status_icon_set_tooltip_text(FStatusIcon, PChar(FTrayIcon.Hint));
{$ELSE}
gtk_status_icon_set_tooltip(FStatusIcon, PChar(FTrayIcon.Hint)); gtk_status_icon_set_tooltip(FStatusIcon, PChar(FTrayIcon.Hint));
{$ENDIF}
g_object_set(PGObject(FStatusIcon), 'has-tooltip', gTRUE, nil); g_object_set(PGObject(FStatusIcon), 'has-tooltip', gTRUE, nil);
fEmbedded := gtk_status_icon_is_embedded(FStatusIcon); fEmbedded := gtk_status_icon_is_embedded(FStatusIcon);
@ -485,7 +489,11 @@ begin
if FStatusIcon <> nil then if FStatusIcon <> nil then
begin begin
gtk_status_icon_set_from_pixbuf(FStatusIcon, NewPixBuf); gtk_status_icon_set_from_pixbuf(FStatusIcon, NewPixBuf);
{$IF FPC_FULLVERSION>30300}
gtk_status_icon_set_tooltip_text(FStatusIcon, PChar(NewHint));
{$ELSE}
gtk_status_icon_set_tooltip(FStatusIcon, PChar(NewHint)); gtk_status_icon_set_tooltip(FStatusIcon, PChar(NewHint));
{$ENDIF}
g_object_set(PGObject(FStatusIcon), 'has-tooltip', gTRUE, nil); g_object_set(PGObject(FStatusIcon), 'has-tooltip', gTRUE, nil);
end end
else else