diff --git a/configure.ac.in b/configure.ac.in index a7b3fbc..078ff5e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -126,7 +126,7 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.16.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) dnl ************************************************* diff --git a/libxfce4ui/xfce-heading.c b/libxfce4ui/xfce-heading.c index df29216..f7e16b5 100644 --- a/libxfce4ui/xfce-heading.c +++ b/libxfce4ui/xfce-heading.c @@ -99,7 +99,7 @@ static void _xfce_heading_init (XfceHeading *heading) { /* setup the widget parameters */ - GTK_WIDGET_UNSET_FLAGS (heading, GTK_NO_WINDOW); + gtk_widget_set_has_window (GTK_WIDGET (heading), FALSE); } @@ -128,7 +128,7 @@ _xfce_heading_realize (GtkWidget *widget) GdkWindowAttr attributes; /* mark the widget as realized */ - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_realized (widget, TRUE); /* setup the window attributes */ attributes.x = widget->allocation.x; @@ -198,7 +198,7 @@ _xfce_heading_style_set (GtkWidget *widget, GtkStyle *previous_style) { /* check if we're already realized */ - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) { /* set background color (using the base color) */ gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]); @@ -258,7 +258,7 @@ _xfce_heading_expose_event (GtkWidget *widget, /* render the title */ gtk_paint_layout (widget->style, widget->window, - GTK_WIDGET_STATE (widget), TRUE, &event->area, + gtk_widget_get_state (widget), TRUE, &event->area, widget, "heading", (rtl ? x - width : x), y, layout); /* release the layout */ diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c index 5c8939d..f8b0558 100644 --- a/libxfce4ui/xfce-titled-dialog.c +++ b/libxfce4ui/xfce-titled-dialog.c @@ -216,7 +216,7 @@ xfce_titled_dialog_close (GtkDialog *dialog) GdkEvent *event; /* verify that the dialog is realized */ - if (G_LIKELY (GTK_WIDGET_REALIZED (dialog))) + if (G_LIKELY (gtk_widget_get_realized (GTK_WIDGET (dialog)))) { /* send a delete event to the dialog */ event = gdk_event_new (GDK_DELETE);