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/gtkimage.h | |
| parent | 3921a791182eafccc8da74f63a69fddaed553227 (diff) | |
| download | gtk+-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/gtkimage.h')
| -rw-r--r-- | gtk/gtkimage.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index b528ef4ac9..ddd4ebd449 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -57,13 +57,11 @@ typedef struct _GtkImageAnimationData GtkImageAnimationData; struct _GtkImagePixmapData { GdkPixmap *pixmap; - GdkBitmap *mask; }; struct _GtkImageImageData { GdkImage *image; - GdkBitmap *mask; }; struct _GtkImagePixbufData @@ -74,13 +72,11 @@ struct _GtkImagePixbufData struct _GtkImageStockData { gchar *stock_id; - GtkIconSize size; }; struct _GtkImageIconSetData { GtkIconSet *icon_set; - GtkIconSize size; }; struct _GtkImageAnimationData @@ -116,6 +112,12 @@ struct _GtkImage GtkImageIconSetData icon_set; GtkImageAnimationData anim; } data; + + /* Only used with GTK_IMAGE_PIXMAP, GTK_IMAGE_IMAGE */ + GdkBitmap *mask; + + /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET */ + GtkIconSize icon_size; }; struct _GtkImageClass |