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/gtkhruler.c | |
| parent | 2aa899147773436da85d0b43711c526c3ee8cf99 (diff) | |
| download | gdk-pixbuf-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/gtkhruler.c')
| -rw-r--r-- | gtk/gtkhruler.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index 320c14942..8e6dc2ad2 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -46,26 +46,28 @@ static void gtk_hruler_draw_ticks (GtkRuler *ruler); static void gtk_hruler_draw_pos (GtkRuler *ruler); -GtkType +GType gtk_hruler_get_type (void) { - static GtkType hruler_type = 0; + static GType hruler_type = 0; if (!hruler_type) { - static const GtkTypeInfo hruler_info = + static const GTypeInfo hruler_info = { - "GtkHRuler", - sizeof (GtkHRuler), sizeof (GtkHRulerClass), - (GtkClassInitFunc) gtk_hruler_class_init, - (GtkObjectInitFunc) gtk_hruler_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_hruler_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkHRuler), + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_hruler_init, }; - hruler_type = gtk_type_unique (GTK_TYPE_RULER, &hruler_info); + hruler_type = g_type_register_static (GTK_TYPE_RULER, "GtkHRuler", + &hruler_info, 0); } return hruler_type; @@ -100,7 +102,7 @@ gtk_hruler_init (GtkHRuler *hruler) GtkWidget* gtk_hruler_new (void) { - return GTK_WIDGET (gtk_type_new (GTK_TYPE_HRULER)); + return g_object_new (GTK_TYPE_HRULER, NULL); } static gint @@ -266,7 +268,7 @@ gtk_hruler_draw_ticks (GtkRuler *ruler) } } - g_object_unref (G_OBJECT (layout)); + g_object_unref (layout); } static void @@ -300,12 +302,12 @@ gtk_hruler_draw_pos (GtkRuler *ruler) { /* If a backing store exists, restore the ruler */ if (ruler->backing_store && ruler->non_gr_exp_gc) - gdk_draw_pixmap (ruler->widget.window, - ruler->non_gr_exp_gc, - ruler->backing_store, - ruler->xsrc, ruler->ysrc, - ruler->xsrc, ruler->ysrc, - bs_width, bs_height); + gdk_draw_drawable (ruler->widget.window, + ruler->non_gr_exp_gc, + ruler->backing_store, + ruler->xsrc, ruler->ysrc, + ruler->xsrc, ruler->ysrc, + bs_width, bs_height); increment = (gdouble) width / (ruler->upper - ruler->lower); |