From 771e07ff2bbcb8ba90d4ad72d892caa71cca1eea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 May 2006 14:11:16 +0000 Subject: Reinstate abstract types --- ChangeLog | 10 ++++++++-- ChangeLog.pre-2-10 | 10 ++++++++-- gtk/gtkimcontext.c | 2 +- gtk/gtkitem.c | 2 +- gtk/gtkmisc.c | 2 +- gtk/gtkoldeditable.c | 6 +++--- gtk/gtkpaned.c | 2 +- gtk/gtkscrollbar.c | 2 +- gtk/gtkseparator.c | 2 +- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e2c789163..315ff172d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ 2006-05-07 Matthias Clasen + * gtk/gtkseparator.c: + * gtk/gtkscrollbar.c: + * gtk/gtkpaned.c: + * gtk/gtkoldeditable.c: + * gtk/gtkmisc.c: + * gtk/gtkitem.c: + * gtk/gtkimcontext.c: * gtk/gtkrange.c: - * gtk/gtkscale.c: GtkRange and GtkScale are supposed to be - abstract types. + * gtk/gtkscale.c: Make types abstract again. 2006-05-06 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7e2c789163..315ff172d4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,14 @@ 2006-05-07 Matthias Clasen + * gtk/gtkseparator.c: + * gtk/gtkscrollbar.c: + * gtk/gtkpaned.c: + * gtk/gtkoldeditable.c: + * gtk/gtkmisc.c: + * gtk/gtkitem.c: + * gtk/gtkimcontext.c: * gtk/gtkrange.c: - * gtk/gtkscale.c: GtkRange and GtkScale are supposed to be - abstract types. + * gtk/gtkscale.c: Make types abstract again. 2006-05-06 Matthias Clasen diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index f2d88497cc..e8eadc3394 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -51,7 +51,7 @@ static void gtk_im_context_real_set_surrounding (GtkIMContext *context, gint len, gint cursor_index); -G_DEFINE_TYPE (GtkIMContext, gtk_im_context, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GtkIMContext, gtk_im_context, G_TYPE_OBJECT); static void gtk_im_context_class_init (GtkIMContextClass *klass) diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index d15b42d15b..10fc731ead 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -48,7 +48,7 @@ static gint gtk_item_leave (GtkWidget *widget, static guint item_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GtkItem, gtk_item, GTK_TYPE_BIN); +G_DEFINE_ABSTRACT_TYPE (GtkItem, gtk_item, GTK_TYPE_BIN); static void gtk_item_class_init (GtkItemClass *class) diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index 5089193cd9..a876d0b023 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -51,7 +51,7 @@ static void gtk_misc_get_property (GObject *object, GParamSpec *pspec); -G_DEFINE_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET); +G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET); static void gtk_misc_class_init (GtkMiscClass *class) diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index 81dd33a499..562fbb122a 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -128,9 +128,9 @@ static gint gtk_old_editable_get_position (GtkEditable *editable); static guint editable_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE_WITH_CODE (GtkOldEditable, gtk_old_editable, GTK_TYPE_WIDGET, - G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, - gtk_old_editable_editable_init)); +G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkOldEditable, gtk_old_editable, GTK_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, + gtk_old_editable_editable_init)); static void gtk_old_editable_class_init (GtkOldEditableClass *class) diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 4690977b3c..5c5be94558 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -138,7 +138,7 @@ struct _GtkPanedPrivate guint32 grab_time; }; -G_DEFINE_TYPE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER); +G_DEFINE_ABSTRACT_TYPE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER); static guint signals[LAST_SIGNAL] = { 0 }; diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index 4165ab5f7d..04ac0d9ea0 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -34,7 +34,7 @@ static void gtk_scrollbar_style_set (GtkWidget *widget, GtkStyle *previous); -G_DEFINE_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE); +G_DEFINE_ABSTRACT_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE); static void gtk_scrollbar_class_init (GtkScrollbarClass *class) diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index 5aa9d332fa..9ee2b1b333 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -30,7 +30,7 @@ #include "gtkalias.h" -G_DEFINE_TYPE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET); +G_DEFINE_ABSTRACT_TYPE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET); static void gtk_separator_class_init (GtkSeparatorClass *class) -- cgit v1.2.1