diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2011-05-24 19:46:50 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2012-01-12 17:09:37 +0100 |
| commit | aa7c16103ad0d1199790e4e5fdae97af020e5260 (patch) | |
| tree | c1e592395a087ee28c57c352aeb19e6f821581f3 /src/ui/metaaccellabel.c | |
| parent | 03d4c13ab32ca42d1226e6f314dbbfe810d46122 (diff) | |
| download | metacity-aa7c16103ad0d1199790e4e5fdae97af020e5260.tar.gz | |
Remove deprecated GTK+ symbols
Based on an original patch from Roberto Guido <bob4mail@gmail.com>
https://bugzilla.gnome.org/show_bug.cgi?id=572332
Diffstat (limited to 'src/ui/metaaccellabel.c')
| -rw-r--r-- | src/ui/metaaccellabel.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c index f4f06ac1..6b02fc47 100644 --- a/src/ui/metaaccellabel.c +++ b/src/ui/metaaccellabel.c @@ -52,31 +52,7 @@ static int meta_accel_label_get_accel_width (MetaAccelLabel *accel_label); static GtkLabelClass *parent_class = NULL; - -GType -meta_accel_label_get_type (void) -{ - static GType accel_label_type = 0; - - if (!accel_label_type) - { - static const GtkTypeInfo accel_label_info = - { - "MetaAccelLabel", - sizeof (MetaAccelLabel), - sizeof (MetaAccelLabelClass), - (GtkClassInitFunc) meta_accel_label_class_init, - (GtkObjectInitFunc) meta_accel_label_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - accel_label_type = gtk_type_unique (GTK_TYPE_LABEL, &accel_label_info); - } - - return accel_label_type; -} +G_DEFINE_TYPE (MetaAccelLabel, meta_accel_label, GTK_TYPE_LABEL); static void meta_accel_label_class_init (MetaAccelLabelClass *class) @@ -262,7 +238,7 @@ meta_accel_label_expose_event (GtkWidget *widget, GtkMisc *misc = GTK_MISC (accel_label); PangoLayout *layout; - if (GTK_WIDGET_DRAWABLE (accel_label)) + if (gtk_widget_is_drawable (GTK_WIDGET (accel_label))) { int ac_width; @@ -307,7 +283,7 @@ meta_accel_label_expose_event (GtkWidget *widget, gtk_paint_layout (widget->style, widget->window, - GTK_WIDGET_STATE (widget), + gtk_widget_get_state (widget), FALSE, &event->area, widget, |