From 276eb145ce96d5f75f8d3901daf6310f60ddbb81 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 22 Nov 2016 15:02:51 -0500 Subject: move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option *Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591 --- eel/eel-background-box.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'eel/eel-background-box.c') diff --git a/eel/eel-background-box.c b/eel/eel-background-box.c index d0b80c4e..72aabec8 100644 --- a/eel/eel-background-box.c +++ b/eel/eel-background-box.c @@ -31,23 +31,12 @@ G_DEFINE_TYPE (EelBackgroundBox, eel_background_box, GTK_TYPE_EVENT_BOX) static gboolean eel_background_box_draw (GtkWidget *widget, -#if GTK_CHECK_VERSION (3, 0, 0) cairo_t *cr) -#else - GdkEventExpose *event) -#endif { -#if GTK_CHECK_VERSION (3, 0, 0) eel_background_draw (widget, cr); gtk_container_propagate_draw (GTK_CONTAINER (widget), gtk_bin_get_child (GTK_BIN (widget)), cr); -#else - eel_background_draw (widget, event); - gtk_container_propagate_expose (GTK_CONTAINER (widget), - gtk_bin_get_child (GTK_BIN (widget)), - event); -#endif return TRUE; } @@ -60,12 +49,8 @@ static void eel_background_box_class_init (EelBackgroundBoxClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - -#if GTK_CHECK_VERSION (3, 0, 0) widget_class->draw = eel_background_box_draw; -#else - widget_class->expose_event = eel_background_box_draw; -#endif + } GtkWidget* -- cgit v1.2.1