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

gtk2: fix gtk2 trayicon crash after icon rework (#0011576)

Browse Source 
git-svn-id: trunk@15634 -
This commit is contained in:
paul 2008-07-01 01:51:12 +00:00
parent a8beee2e0b
commit b8ed3fae72
2 changed files with 443 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,8 +316,6 @@ end;
class function TGtk2WSCustomTrayIcon.Show(const ATrayIcon: TCustomTrayIcon): Boolean;
var
AImage: PGtkWidget;
AMask: PGdkBitmap;
GDIObject: PgdiObject;
begin
Result := False;
@ -355,15 +353,7 @@ begin
* Draws the icon
*******************************************************************}
GDIObject := PgdiObject(ATrayIcon.Icon.Handle);
AMask := CreateGdkMaskBitmap(
GDIObject^.GDIPixmapObject.Mask,
GDIObject^.GDIBitmapObject);
AImage := gtk_image_new_from_pixmap(GDIObject^.GDIPixmapObject.Image, AMask);
g_object_unref(AMask);
AImage := gtk_image_new_from_pixbuf(PGdkPixbuf(ATrayIcon.Icon.Handle));
gtk_widget_show(AImage);

2
lcl/interfaces/gtk2/gtk2wsextctrls.pp
View File

@ -30,7 +30,7 @@ interface
uses
// libs
Math, GLib2, Gtk2, Gdk2, Gtk2Int, gtkProc, GtkDef,
Math, GLib2, Gtk2, Gdk2, Gdk2Pixbuf, Gtk2Int, GtkProc, GtkDef,
// LCL
LCLProc, ExtCtrls, Classes, Controls, SysUtils, LCLType,
// widgetset