Improve wording. String change! (#355128, David Lodge)

[~andy/gtk] / gtk / gtkimage.h

diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 9f42596ae05fb9881002cd867685ff5df07aeb38..e1b061cca3b4aa6bc0fc2d74d1177713dd06c4a8 100644 (file)
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -32,16 +32,14 @@
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IMAGE                  (gtk_image_get_type ())
-#define GTK_IMAGE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_IMAGE, GtkImage))
-#define GTK_IMAGE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE, GtkImageClass))
-#define GTK_IS_IMAGE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMAGE))
-#define GTK_IS_IMAGE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE))
-#define GTK_IMAGE_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
+#define GTK_IMAGE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage))
+#define GTK_IMAGE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE, GtkImageClass))
+#define GTK_IS_IMAGE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE))
+#define GTK_IS_IMAGE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE))
+#define GTK_IMAGE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
 
 
 typedef struct _GtkImage       GtkImage;
@@ -53,6 +51,7 @@ typedef struct _GtkImagePixbufData  GtkImagePixbufData;
 typedef struct _GtkImageStockData   GtkImageStockData;
 typedef struct _GtkImageIconSetData GtkImageIconSetData;
 typedef struct _GtkImageAnimationData GtkImageAnimationData;
+typedef struct _GtkImageIconNameData  GtkImageIconNameData;
 
 struct _GtkImagePixmapData
 {
@@ -86,6 +85,13 @@ struct _GtkImageAnimationData
   guint frame_timeout;
 };
 
+struct _GtkImageIconNameData
+{
+  gchar *icon_name;
+  GdkPixbuf *pixbuf;
+  guint theme_change_id;
+};
+
 typedef enum
 {
   GTK_IMAGE_EMPTY,
@@ -94,7 +100,8 @@ typedef enum
   GTK_IMAGE_PIXBUF,
   GTK_IMAGE_STOCK,
   GTK_IMAGE_ICON_SET,
-  GTK_IMAGE_ANIMATION
+  GTK_IMAGE_ANIMATION,
+  GTK_IMAGE_ICON_NAME
 } GtkImageType;
 
 struct _GtkImage
@@ -111,12 +118,13 @@ struct _GtkImage
     GtkImageStockData stock;
     GtkImageIconSetData icon_set;
     GtkImageAnimationData anim;
+    GtkImageIconNameData name;
   } data;
 
   /* Only used with GTK_IMAGE_PIXMAP, GTK_IMAGE_IMAGE */
   GdkBitmap *mask;
 
-  /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET */
+  /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET, GTK_IMAGE_ICON_NAME */
   GtkIconSize icon_size;
 };
 
@@ -131,7 +139,13 @@ struct _GtkImageClass
   void (*_gtk_reserved4) (void);
 };
 
-GtkType    gtk_image_get_type (void) G_GNUC_CONST;
+#ifdef G_OS_WIN32
+/* Reserve old names for DLL ABI backward compatibility */
+#define gtk_image_new_from_file gtk_image_new_from_file_utf8
+#define gtk_image_set_from_file gtk_image_set_from_file_utf8
+#endif
+
+GType      gtk_image_get_type (void) G_GNUC_CONST;
 
 GtkWidget* gtk_image_new                (void);
 GtkWidget* gtk_image_new_from_pixmap    (GdkPixmap       *pixmap,
@@ -145,7 +159,10 @@ GtkWidget* gtk_image_new_from_stock     (const gchar     *stock_id,
 GtkWidget* gtk_image_new_from_icon_set  (GtkIconSet      *icon_set,
                                          GtkIconSize      size);
 GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation);
+GtkWidget* gtk_image_new_from_icon_name (const gchar     *icon_name,
+                                        GtkIconSize      size);
 
+void gtk_image_clear              (GtkImage        *image);
 void gtk_image_set_from_pixmap    (GtkImage        *image,
                                    GdkPixmap       *pixmap,
                                    GdkBitmap       *mask);
@@ -164,6 +181,11 @@ void gtk_image_set_from_icon_set  (GtkImage        *image,
                                    GtkIconSize      size);
 void gtk_image_set_from_animation (GtkImage           *image,
                                    GdkPixbufAnimation *animation);
+void gtk_image_set_from_icon_name (GtkImage        *image,
+                                  const gchar     *icon_name,
+                                  GtkIconSize      size);
+void gtk_image_set_pixel_size     (GtkImage        *image,
+                                  gint             pixel_size);
 
 GtkImageType gtk_image_get_storage_type (GtkImage   *image);
 
@@ -181,7 +203,10 @@ void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSet      **icon_set,
                                    GtkIconSize      *size);
 GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
-
+void       gtk_image_get_icon_name (GtkImage              *image,
+                                   G_CONST_RETURN gchar **icon_name,
+                                   GtkIconSize           *size);
+gint       gtk_image_get_pixel_size (GtkImage             *image);
 
 #ifndef GTK_DISABLE_DEPRECATED
 /* These three are deprecated */
@@ -194,9 +219,6 @@ void       gtk_image_get      (GtkImage   *image,
                               GdkBitmap **mask);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IMAGE_H__ */