diff options
| -rw-r--r-- | src/ui/metaaccellabel.c | 4 | ||||
| -rw-r--r-- | src/wm-tester/main.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c index 3ef870bc..e20bdeaa 100644 --- a/src/ui/metaaccellabel.c +++ b/src/ui/metaaccellabel.c @@ -423,7 +423,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; @@ -468,7 +468,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, diff --git a/src/wm-tester/main.c b/src/wm-tester/main.c index d757270d..ae6db421 100644 --- a/src/wm-tester/main.c +++ b/src/wm-tester/main.c @@ -120,19 +120,11 @@ evil_timeout (gpointer data) w = gtk_window_new (GTK_WINDOW_TOPLEVEL); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_window_move (GTK_WINDOW (w), g_random_int_range (0, gdk_screen_width ()), g_random_int_range (0, gdk_screen_height ())); -#else - gtk_widget_set_uposition (w, - g_random_int_range (0, - gdk_screen_width ()), - g_random_int_range (0, - gdk_screen_height ())); -#endif parent = NULL; |