diff options
| author | Manish Singh <yosh@gimp.org> | 2002-10-10 01:02:25 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2002-10-10 01:02:25 +0000 |
| commit | 28bc53032b1bea0fe22798a8542f8036d3f735b3 (patch) | |
| tree | 4adccdfc8a24aeec5026bdd531d482a6537bb8db /gtk/gtkfixed.c | |
| parent | 8b6ce08115283d4ba30c84f3fad6008a142fd711 (diff) | |
| download | gtk+-28bc53032b1bea0fe22798a8542f8036d3f735b3.tar.gz | |
Deprecation cleanup
Wed Oct 9 17:40:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkaccelmap.c gtk/gtkfixed.[ch] gtk/gtkkeyhash.c gtk/gtkmenu.c
gtk/gtkobject.c gtk/gtkoldeditable.c gtk/gtkrc.c gtk/gtkspinbutton.[ch]
gtk/gtktable.[ch] gtk/gtkthemes.c: Deprecation cleanup
Diffstat (limited to 'gtk/gtkfixed.c')
| -rw-r--r-- | gtk/gtkfixed.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index d48c6604c2..10a03fb4be 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -48,7 +48,7 @@ static void gtk_fixed_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static GtkType gtk_fixed_child_type (GtkContainer *container); +static GType gtk_fixed_child_type (GtkContainer *container); static void gtk_fixed_set_child_property (GtkContainer *container, GtkWidget *child, @@ -64,26 +64,28 @@ static void gtk_fixed_get_child_property (GtkContainer *container, static GtkContainerClass *parent_class = NULL; -GtkType +GType gtk_fixed_get_type (void) { - static GtkType fixed_type = 0; + static GType fixed_type = 0; if (!fixed_type) { - static const GtkTypeInfo fixed_info = + static const GTypeInfo fixed_info = { - "GtkFixed", - sizeof (GtkFixed), sizeof (GtkFixedClass), - (GtkClassInitFunc) gtk_fixed_class_init, - (GtkObjectInitFunc) gtk_fixed_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_fixed_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkFixed), + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_fixed_init, }; - fixed_type = gtk_type_unique (GTK_TYPE_CONTAINER, &fixed_info); + fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkFixed", + &fixed_info, 0); } return fixed_type; @@ -92,15 +94,13 @@ gtk_fixed_get_type (void) static void gtk_fixed_class_init (GtkFixedClass *class) { - GtkObjectClass *object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; - object_class = (GtkObjectClass*) class; widget_class = (GtkWidgetClass*) class; container_class = (GtkContainerClass*) class; - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + parent_class = g_type_class_peek_parent (class); widget_class->realize = gtk_fixed_realize; widget_class->size_request = gtk_fixed_size_request; @@ -135,7 +135,7 @@ gtk_fixed_class_init (GtkFixedClass *class) G_PARAM_READWRITE)); } -static GtkType +static GType gtk_fixed_child_type (GtkContainer *container) { return GTK_TYPE_WIDGET; @@ -152,10 +152,7 @@ gtk_fixed_init (GtkFixed *fixed) GtkWidget* gtk_fixed_new (void) { - GtkFixed *fixed; - - fixed = gtk_type_new (GTK_TYPE_FIXED); - return GTK_WIDGET (fixed); + return g_object_new (GTK_TYPE_FIXED, NULL); } static GtkFixedChild* |