diff options
| author | Havoc Pennington <hp@pobox.com> | 2001-08-29 02:20:02 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-08-29 02:20:02 +0000 |
| commit | 9df007468539fa9fe85612eedf0af44dd64f3c98 (patch) | |
| tree | 7a3dda0769668d56159dc7e7090eac95a2843985 /gtk/gtkdnd.c | |
| parent | 3921a791182eafccc8da74f63a69fddaed553227 (diff) | |
| download | gdk-pixbuf-9df007468539fa9fe85612eedf0af44dd64f3c98.tar.gz | |
add default icon
2001-08-28 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/main.c (setup_default_icon): add default icon
* gtk/gtkradiobutton.c (gtk_radio_button_new_with_mnemonic):
warning fix
(gtk_radio_button_new_with_label): warning fix
* gtk/gtkdnd.c: used some random GtkImage private structs,
update to reflect GtkImage changes
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): don't check
whether the hint is supported, just always set the icon. A task
list might want to use it even if the WM doesn't, and the WM may
change over time. Also, XDeleteProperty() if list == NULL.
* gtk/gtkwindow.c (gtk_window_set_icon_list)
(gtk_window_get_icon_list)
(gtk_window_set_icon)
(gtk_window_get_icon)
(gtk_window_set_default_icon_list)
(gtk_window_get_default_icon_list):
new functions
* gtk/gtk-boxed.defs (GtkIconSet): add GtkIconSet
* gtk/gtkimage.c: Implement property support, bug #59408
* gtk/gtkcontainer.c (gtk_container_add): make the warning message
on reparent-without-removing-first a bit more helpful.
Let's just destroy this FAQ.
Diffstat (limited to 'gtk/gtkdnd.c')
| -rw-r--r-- | gtk/gtkdnd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index cd3f14cb1..d78688cc0 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -78,6 +78,7 @@ struct _GtkDragSourceSite GtkImagePixbufData pixbuf; GtkImageStockData stock; } icon_data; + GdkBitmap *icon_mask; GdkColormap *colormap; /* Colormap for drag icon */ @@ -1941,8 +1942,8 @@ gtk_drag_source_unset_icon (GtkDragSourceSite *site) case GTK_IMAGE_PIXMAP: if (site->icon_data.pixmap.pixmap) gdk_pixmap_unref (site->icon_data.pixmap.pixmap); - if (site->icon_data.pixmap.mask) - gdk_pixmap_unref (site->icon_data.pixmap.mask); + if (site->icon_mask) + gdk_pixmap_unref (site->icon_mask); break; case GTK_IMAGE_PIXBUF: g_object_unref (G_OBJECT (site->icon_data.pixbuf.pixbuf)); @@ -1999,7 +2000,7 @@ gtk_drag_source_set_icon (GtkWidget *widget, site->icon_type = GTK_IMAGE_PIXMAP; site->icon_data.pixmap.pixmap = pixmap; - site->icon_data.pixmap.mask = mask; + site->icon_mask = mask; site->colormap = colormap; } @@ -2683,7 +2684,7 @@ gtk_drag_source_event_cb (GtkWidget *widget, gtk_drag_set_icon_pixmap (context, site->colormap, site->icon_data.pixmap.pixmap, - site->icon_data.pixmap.mask, + site->icon_mask, -2, -2); break; case GTK_IMAGE_PIXBUF: |