summaryrefslogtreecommitdiff
path: root/gtk/gtkimage.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-05-07 15:58:47 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-05-07 15:58:47 +0000
commitb4e4a0ed9d66132efad0539bc5901b35ea262d88 (patch)
tree7eea37afc0c2f32334112872547373758ac7d6b6 /gtk/gtkimage.h
parent607ac1e1b31dc21598830a22930bcc39a77cb5c3 (diff)
downloadgtk+-b4e4a0ed9d66132efad0539bc5901b35ea262d88.tar.gz
fix some shell typos
2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos * gtk/gtkcolorsel.c (gtk_color_selection_destroy): warning fix * gtk/gtkimage.c: handle animations * gtk/gtkcheckbutton.c (gtk_check_button_size_request): request border_width * 2, not just border_width * gtk/gtkscale.c: add "format_value" signal to allow people to override the way values are drawn. (gtk_scale_get_value_size): fix width/height mistake, and compute size from actual displayed text, not from made-up text. * gtk/gtktexttag.c (gtk_text_tag_class_init): fix return type in signal registration * tests/testtext.c: Add "Remove all tags" menu item for testing * gtk/gtktextbuffer.c (gtk_text_buffer_remove_all_tags): implement * demos/gtk-demo/main.c (main): add hack so we can find modules without installing gtk * demos/gtk-demo/textview.c (insert_text): demo font scaling * gtk/gtkcellrenderertext.c: Add "scale" property (font scaling factor) (gtk_cell_renderer_text_set_property): remove some bogus g_object_notify * gtk/gtktexttag.c: add "scale" property which is a font scaling factor * gtk/gtktextlayout.c (add_text_attrs): add font scale attribute to layout * gtk/gtktextiter.c (gtk_text_iter_is_start): rename from gtk_text_iter_is_first 2001-05-04 Havoc Pennington <hp@redhat.com> * pixops/pixops.c (pixops_process): merge fix from stable: Patch from hoshem@mel.comcen.com.au to fix nonzero X offsets. Fixes bug #50371. * gdk-pixbuf/pixops/pixops.c (pixops_composite_nearest): merge from stable: Patch from OKADA Mitsuru <m-okada@fjb.co.jp> to fix confusion of using "src" instead of "p". (pixops_composite_color_nearest): Use a more accurate (and correct, to begin with) compositing method. This cures checks showing through on images with no alpha. * gdk-pixbuf.c (gdk_pixbuf_fill): fix bug that left some trailing bytes unfilled. * gdk-pixbuf-io.h: fix UpdatedNotifyFunc to use signed ints * gdk-pixbuf-loader.h (struct _GdkPixbufLoaderClass): Change area_updated signal to use signed ints. Removed animation-related signals. * io-gif.c, io-gif-animation.h, io-gif-animation.c: Massive rewrite action * gdk-pixbuf-animation.c: Add GdkPixbufAnimationIter to abstract all the pesky details. Remove old frame-based API. Make GdkPixbufAnimation an abstract base class, derived by the loaders.
Diffstat (limited to 'gtk/gtkimage.h')
-rw-r--r--gtk/gtkimage.h70
1 files changed, 42 insertions, 28 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index bc1a0c0a60..71c80dfd0a 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -52,6 +52,7 @@ typedef struct _GtkImageImageData GtkImageImageData;
typedef struct _GtkImagePixbufData GtkImagePixbufData;
typedef struct _GtkImageStockData GtkImageStockData;
typedef struct _GtkImageIconSetData GtkImageIconSetData;
+typedef struct _GtkImageAnimationData GtkImageAnimationData;
struct _GtkImagePixmapData
{
@@ -82,6 +83,13 @@ struct _GtkImageIconSetData
GtkIconSize size;
};
+struct _GtkImageAnimationData
+{
+ GdkPixbufAnimation *anim;
+ GdkPixbufAnimationIter *iter;
+ guint frame_timeout;
+};
+
typedef enum
{
GTK_IMAGE_EMPTY,
@@ -89,7 +97,8 @@ typedef enum
GTK_IMAGE_IMAGE,
GTK_IMAGE_PIXBUF,
GTK_IMAGE_STOCK,
- GTK_IMAGE_ICON_SET
+ GTK_IMAGE_ICON_SET,
+ GTK_IMAGE_ANIMATION
} GtkImageType;
struct _GtkImage
@@ -105,6 +114,7 @@ struct _GtkImage
GtkImagePixbufData pixbuf;
GtkImageStockData stock;
GtkImageIconSetData icon_set;
+ GtkImageAnimationData anim;
} data;
};
@@ -115,33 +125,36 @@ struct _GtkImageClass
GtkType gtk_image_get_type (void) G_GNUC_CONST;
-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_pixbuf (GdkPixbuf *pixbuf);
-GtkWidget* gtk_image_new_from_stock (const gchar *stock_id,
- GtkIconSize size);
-GtkWidget* gtk_image_new_from_icon_set (GtkIconSet *icon_set,
- GtkIconSize size);
-
-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_pixbuf (GtkImage *image,
- GdkPixbuf *pixbuf);
-void gtk_image_set_from_stock (GtkImage *image,
- const gchar *stock_id,
- GtkIconSize size);
-void gtk_image_set_from_icon_set (GtkImage *image,
- GtkIconSet *icon_set,
- GtkIconSize size);
+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_pixbuf (GdkPixbuf *pixbuf);
+GtkWidget* gtk_image_new_from_stock (const gchar *stock_id,
+ GtkIconSize size);
+GtkWidget* gtk_image_new_from_icon_set (GtkIconSet *icon_set,
+ GtkIconSize size);
+GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation);
+
+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_pixbuf (GtkImage *image,
+ GdkPixbuf *pixbuf);
+void gtk_image_set_from_stock (GtkImage *image,
+ const gchar *stock_id,
+ GtkIconSize size);
+void gtk_image_set_from_icon_set (GtkImage *image,
+ GtkIconSet *icon_set,
+ GtkIconSize size);
+void gtk_image_set_from_animation (GtkImage *image,
+ GdkPixbufAnimation *animation);
GtkImageType gtk_image_get_storage_type (GtkImage *image);
@@ -158,6 +171,7 @@ void gtk_image_get_stock (GtkImage *image,
void gtk_image_get_icon_set (GtkImage *image,
GtkIconSet **icon_set,
GtkIconSize *size);
+GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
#ifndef GTK_DISABLE_DEPRECATED