From 7b5cf0dbd66a33d1060f931ec959a98f3b31a7fe Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 25 May 2005 19:39:35 +0000 Subject: [PATCH] No need to expose the iter subclass at all in the headers. 2005-05-25 Matthias Clasen * gdk-pixbuf.symbols: * gdk-pixbuf-simple-anim.[hc]: No need to expose the iter subclass at all in the headers. --- gdk-pixbuf/ChangeLog | 4 ++++ gdk-pixbuf/gdk-pixbuf-simple-anim.c | 15 +++++++++++++++ gdk-pixbuf/gdk-pixbuf-simple-anim.h | 13 ------------- gdk-pixbuf/gdk-pixbuf.symbols | 1 - 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 8685cbd683..75e10077c3 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,9 @@ 2005-05-25 Matthias Clasen + * gdk-pixbuf.symbols: + * gdk-pixbuf-simple-anim.[hc]: No need to expose the iter + subclass at all in the headers. + * Makefile.am: Add new files. * gdk-pixbuf.symbols: Add new api. diff --git a/gdk-pixbuf/gdk-pixbuf-simple-anim.c b/gdk-pixbuf/gdk-pixbuf-simple-anim.c index 82d908fc84..ebc12b6947 100644 --- a/gdk-pixbuf/gdk-pixbuf-simple-anim.c +++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.c @@ -55,6 +55,21 @@ struct _GdkPixbufSimpleAnim gboolean loop; }; + +typedef struct _GdkPixbufSimpleAnimIter GdkPixbufSimpleAnimIter; +typedef struct _GdkPixbufSimpleAnimIterClass GdkPixbufSimpleAnimIterClass; + +#define GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER (gdk_pixbuf_simple_anim_iter_get_type ()) +#define GDK_PIXBUF_SIMPLE_ANIM_ITER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIter)) +#define GDK_IS_PIXBUF_SIMPLE_ANIM_ITER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER)) + +#define GDK_PIXBUF_SIMPLE_ANIM_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIterClass)) +#define GDK_IS_PIXBUF_SIMPLE_ANIM_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER)) +#define GDK_PIXBUF_SIMPLE_ANIM_ITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIterClass)) + +GType gdk_pixbuf_simple_anim_iter_get_type (void) G_GNUC_CONST; + + struct _GdkPixbufSimpleAnimIterClass { GdkPixbufAnimationIterClass parent_class; diff --git a/gdk-pixbuf/gdk-pixbuf-simple-anim.h b/gdk-pixbuf/gdk-pixbuf-simple-anim.h index bdb2cba111..81aeb72027 100644 --- a/gdk-pixbuf/gdk-pixbuf-simple-anim.h +++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.h @@ -41,19 +41,6 @@ typedef struct _GdkPixbufSimpleAnimClass GdkPixbufSimpleAnimClass; GType gdk_pixbuf_simple_anim_get_type (void) G_GNUC_CONST; -typedef struct _GdkPixbufSimpleAnimIter GdkPixbufSimpleAnimIter; -typedef struct _GdkPixbufSimpleAnimIterClass GdkPixbufSimpleAnimIterClass; - -#define GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER (gdk_pixbuf_simple_anim_iter_get_type ()) -#define GDK_PIXBUF_SIMPLE_ANIM_ITER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIter)) -#define GDK_IS_PIXBUF_SIMPLE_ANIM_ITER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER)) - -#define GDK_PIXBUF_SIMPLE_ANIM_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIterClass)) -#define GDK_IS_PIXBUF_SIMPLE_ANIM_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER)) -#define GDK_PIXBUF_SIMPLE_ANIM_ITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER, GdkPixbufSimpleAnimIterClass)) - -GType gdk_pixbuf_simple_anim_iter_get_type (void) G_GNUC_CONST; - GdkPixbufSimpleAnim *gdk_pixbuf_simple_anim_new (gint width, gint height, gfloat rate); diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols index 457c95edd0..24975cff22 100644 --- a/gdk-pixbuf/gdk-pixbuf.symbols +++ b/gdk-pixbuf/gdk-pixbuf.symbols @@ -127,7 +127,6 @@ gdk_pixbuf_non_anim_new gdk_pixbuf_simple_anim_get_type G_GNUC_CONST gdk_pixbuf_simple_anim_new gdk_pixbuf_simple_anim_add_frame -gdk_pixbuf_simple_anim_iter_get_type G_GNUC_CONST #endif #endif