diff options
| author | Manish Singh <yosh@gimp.org> | 2002-10-04 23:50:27 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2002-10-04 23:50:27 +0000 |
| commit | 2ffa58f11d0fdfdee4859f37dd69bcec21b34e41 (patch) | |
| tree | 48127a3db81fb37f274d8ca497e68f9e6d0fe64f /gtk/gtkframe.c | |
| parent | 2aa899147773436da85d0b43711c526c3ee8cf99 (diff) | |
| download | gtk+-2ffa58f11d0fdfdee4859f37dd69bcec21b34e41.tar.gz | |
Deprecation cleanup
Fri Oct 4 16:48:27 2002 Manish Singh <yosh@gimp.org>
* gtkaspectframe.[ch] gtkbin.[ch] gtkframe.[ch] gtkhruler.[ch]
gtkruler.[ch] gtkvruler.[ch]: Deprecation cleanup
Diffstat (limited to 'gtk/gtkframe.c')
| -rw-r--r-- | gtk/gtkframe.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index bedf2c4ae8..8d43389fde 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -76,26 +76,28 @@ static void gtk_frame_real_compute_child_allocation (GtkFrame *frame, static GtkBinClass *parent_class = NULL; -GtkType +GType gtk_frame_get_type (void) { - static GtkType frame_type = 0; + static GType frame_type = 0; if (!frame_type) { - static const GtkTypeInfo frame_info = + static const GTypeInfo frame_info = { - "GtkFrame", - sizeof (GtkFrame), sizeof (GtkFrameClass), - (GtkClassInitFunc) gtk_frame_class_init, - (GtkObjectInitFunc) gtk_frame_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_frame_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkFrame), + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_frame_init, }; - frame_type = gtk_type_unique (gtk_bin_get_type (), &frame_info); + frame_type = g_type_register_static (GTK_TYPE_BIN, "GtkFrame", + &frame_info, 0); } return frame_type; @@ -105,16 +107,14 @@ static void gtk_frame_class_init (GtkFrameClass *class) { GObjectClass *gobject_class; - GtkObjectClass *object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; gobject_class = (GObjectClass*) class; - object_class = GTK_OBJECT_CLASS (class); widget_class = GTK_WIDGET_CLASS (class); container_class = GTK_CONTAINER_CLASS (class); - parent_class = gtk_type_class (gtk_bin_get_type ()); + parent_class = g_type_class_peek_parent (class); gobject_class->set_property = gtk_frame_set_property; gobject_class->get_property = gtk_frame_get_property; @@ -265,13 +265,7 @@ gtk_frame_get_property (GObject *object, GtkWidget* gtk_frame_new (const gchar *label) { - GtkFrame *frame; - - frame = gtk_type_new (gtk_frame_get_type ()); - - gtk_frame_set_label (frame, label); - - return GTK_WIDGET (frame); + return g_object_new (GTK_TYPE_FRAME, "label", label, NULL); } static void @@ -470,7 +464,7 @@ gtk_frame_set_shadow_type (GtkFrame *frame, if (GTK_WIDGET_DRAWABLE (frame)) { - gtk_widget_queue_clear (GTK_WIDGET (frame)); + gtk_widget_queue_draw (GTK_WIDGET (frame)); } gtk_widget_queue_resize (GTK_WIDGET (frame)); |