X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimage.h;h=023f20c5a428b946153562e2157ef92701ca8300;hb=32825a66ac8e65bf98cafed26a339fa1f31eddd4;hp=13da499888a221e48e0de4bc6396709eed6f89ca;hpb=5e29973773d4e2177f234675cc2a2b2016aa9fbc;p=~andy%2Fgtk
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 13da49988..023f20c5a 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,14 +22,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_IMAGE_H__
#define __GTK_IMAGE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
#include
@@ -46,71 +44,16 @@ G_BEGIN_DECLS
#define GTK_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
-typedef struct _GtkImage GtkImage;
-typedef struct _GtkImageClass GtkImageClass;
-
-typedef struct _GtkImagePixmapData GtkImagePixmapData;
-typedef struct _GtkImageImageData GtkImageImageData;
-typedef struct _GtkImagePixbufData GtkImagePixbufData;
-typedef struct _GtkImageStockData GtkImageStockData;
-typedef struct _GtkImageIconSetData GtkImageIconSetData;
-typedef struct _GtkImageAnimationData GtkImageAnimationData;
-typedef struct _GtkImageIconNameData GtkImageIconNameData;
-typedef struct _GtkImageGIconData GtkImageGIconData;
-
-struct _GtkImagePixmapData
-{
- GdkPixmap *pixmap;
-};
-
-struct _GtkImageImageData
-{
- GdkImage *image;
-};
-
-struct _GtkImagePixbufData
-{
- GdkPixbuf *pixbuf;
-};
-
-struct _GtkImageStockData
-{
- gchar *stock_id;
-};
-
-struct _GtkImageIconSetData
-{
- GtkIconSet *icon_set;
-};
-
-struct _GtkImageAnimationData
-{
- GdkPixbufAnimation *anim;
- GdkPixbufAnimationIter *iter;
- guint frame_timeout;
-};
-
-struct _GtkImageIconNameData
-{
- gchar *icon_name;
- GdkPixbuf *pixbuf;
- guint theme_change_id;
-};
-
-struct _GtkImageGIconData
-{
- GIcon *icon;
- GdkPixbuf *pixbuf;
- guint theme_change_id;
-};
+typedef struct _GtkImage GtkImage;
+typedef struct _GtkImagePrivate GtkImagePrivate;
+typedef struct _GtkImageClass GtkImageClass;
/**
* GtkImageType:
* @GTK_IMAGE_EMPTY: there is no image displayed by the widget
- * @GTK_IMAGE_PIXMAP: the widget contains a #GdkPixmap
- * @GTK_IMAGE_IMAGE: the widget contains a #GdkImage
* @GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
- * @GTK_IMAGE_STOCK: the widget contains a stock icon name (see )
+ * @GTK_IMAGE_STOCK: the widget contains a stock icon name (see
+ * )
* @GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
* @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
* @GTK_IMAGE_ICON_NAME: the widget contains a named icon.
@@ -129,8 +72,6 @@ struct _GtkImageGIconData
typedef enum
{
GTK_IMAGE_EMPTY,
- GTK_IMAGE_PIXMAP,
- GTK_IMAGE_IMAGE,
GTK_IMAGE_PIXBUF,
GTK_IMAGE_STOCK,
GTK_IMAGE_ICON_SET,
@@ -149,25 +90,8 @@ struct _GtkImage
{
GtkMisc misc;
- GtkImageType GSEAL (storage_type);
-
- union
- {
- GtkImagePixmapData pixmap;
- GtkImageImageData image;
- GtkImagePixbufData pixbuf;
- GtkImageStockData stock;
- GtkImageIconSetData icon_set;
- GtkImageAnimationData anim;
- GtkImageIconNameData name;
- GtkImageGIconData gicon;
- } GSEAL (data);
-
- /* Only used with GTK_IMAGE_PIXMAP, GTK_IMAGE_IMAGE */
- GdkBitmap *GSEAL (mask);
-
- /* Only used with GTK_IMAGE_STOCK, GTK_IMAGE_ICON_SET, GTK_IMAGE_ICON_NAME */
- GtkIconSize GSEAL (icon_size);
+ /*< private >*/
+ GtkImagePrivate *priv;
};
struct _GtkImageClass
@@ -181,20 +105,11 @@ struct _GtkImageClass
void (*_gtk_reserved4) (void);
};
-#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,
- GdkBitmap *mask);
-GtkWidget* gtk_image_new_from_image (GdkImage *image,
- GdkBitmap *mask);
GtkWidget* gtk_image_new_from_file (const gchar *filename);
+GtkWidget* gtk_image_new_from_resource (const gchar *resource_path);
GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf);
GtkWidget* gtk_image_new_from_stock (const gchar *stock_id,
GtkIconSize size);
@@ -207,14 +122,10 @@ GtkWidget* gtk_image_new_from_gicon (GIcon *icon,
GtkIconSize size);
void gtk_image_clear (GtkImage *image);
-void gtk_image_set_from_pixmap (GtkImage *image,
- GdkPixmap *pixmap,
- GdkBitmap *mask);
-void gtk_image_set_from_image (GtkImage *image,
- GdkImage *gdk_image,
- GdkBitmap *mask);
void gtk_image_set_from_file (GtkImage *image,
const gchar *filename);
+void gtk_image_set_from_resource (GtkImage *image,
+ const gchar *resource_path);
void gtk_image_set_from_pixbuf (GtkImage *image,
GdkPixbuf *pixbuf);
void gtk_image_set_from_stock (GtkImage *image,
@@ -236,12 +147,6 @@ void gtk_image_set_pixel_size (GtkImage *image,
GtkImageType gtk_image_get_storage_type (GtkImage *image);
-void gtk_image_get_pixmap (GtkImage *image,
- GdkPixmap **pixmap,
- GdkBitmap **mask);
-void gtk_image_get_image (GtkImage *image,
- GdkImage **gdk_image,
- GdkBitmap **mask);
GdkPixbuf* gtk_image_get_pixbuf (GtkImage *image);
void gtk_image_get_stock (GtkImage *image,
gchar **stock_id,
@@ -250,9 +155,9 @@ 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);
+void gtk_image_get_icon_name (GtkImage *image,
+ const gchar **icon_name,
+ GtkIconSize *size);
void gtk_image_get_gicon (GtkImage *image,
GIcon **gicon,
GtkIconSize *size);