diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-03-12 18:46:53 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-03-12 18:46:53 +0000 |
| commit | 10a173fedf26019270363b2a8e86286e9ca4b437 (patch) | |
| tree | 99c3a1ca5ba65a84b21a06ba70994be04985938c /gtk/gtkimage.h | |
| parent | a647514c3393ef5d59b7b9ba11bcee1149519916 (diff) | |
| download | gtk+-10a173fedf26019270363b2a8e86286e9ca4b437.tar.gz | |
Switch to using an enum with registration for icon sizes, instead of
2001-03-12 Havoc Pennington <hp@redhat.com>
* gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: Switch to using an
enum with registration for icon sizes, instead of strings.
* gtkimage.h, gtkimage.c, gtkstyle.h, gtkstyle.c, gtkwidget.h,
gtkwidget.c: Fix to reflect GtkIconSize
Diffstat (limited to 'gtk/gtkimage.h')
| -rw-r--r-- | gtk/gtkimage.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 0c5da6db62..bc1a0c0a60 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -73,13 +73,13 @@ struct _GtkImagePixbufData struct _GtkImageStockData { gchar *stock_id; - gchar *size; + GtkIconSize size; }; struct _GtkImageIconSetData { GtkIconSet *icon_set; - gchar *size; + GtkIconSize size; }; typedef enum @@ -122,9 +122,9 @@ GtkWidget* gtk_image_new_from_image (GdkImage *image, GtkWidget* gtk_image_new_from_file (const gchar *filename); GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); GtkWidget* gtk_image_new_from_stock (const gchar *stock_id, - const gchar *size); + GtkIconSize size); GtkWidget* gtk_image_new_from_icon_set (GtkIconSet *icon_set, - const gchar *size); + GtkIconSize size); void gtk_image_set_from_pixmap (GtkImage *image, GdkPixmap *pixmap, @@ -138,10 +138,10 @@ void gtk_image_set_from_pixbuf (GtkImage *image, GdkPixbuf *pixbuf); void gtk_image_set_from_stock (GtkImage *image, const gchar *stock_id, - const gchar *size); + GtkIconSize size); void gtk_image_set_from_icon_set (GtkImage *image, GtkIconSet *icon_set, - const gchar *size); + GtkIconSize size); GtkImageType gtk_image_get_storage_type (GtkImage *image); @@ -154,10 +154,10 @@ void gtk_image_get_image (GtkImage *image, GdkPixbuf* gtk_image_get_pixbuf (GtkImage *image); void gtk_image_get_stock (GtkImage *image, gchar **stock_id, - gchar **size); + GtkIconSize *size); void gtk_image_get_icon_set (GtkImage *image, GtkIconSet **icon_set, - gchar **size); + GtkIconSize *size); #ifndef GTK_DISABLE_DEPRECATED |