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 --- libcaja-private/caja-column-chooser.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'libcaja-private/caja-column-chooser.c') diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c index c5ae9779..7c4a096f 100644 --- a/libcaja-private/caja-column-chooser.c +++ b/libcaja-private/caja-column-chooser.c @@ -31,10 +31,6 @@ #include "caja-column-utilities.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - struct _CajaColumnChooserDetails { GtkTreeView *view; @@ -69,11 +65,7 @@ enum }; static guint signals[LAST_SIGNAL] = { 0 }; -#if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE(CajaColumnChooser, caja_column_chooser, GTK_TYPE_BOX); -#else -G_DEFINE_TYPE(CajaColumnChooser, caja_column_chooser, GTK_TYPE_HBOX); -#endif static void caja_column_chooser_constructed (GObject *object); @@ -379,7 +371,7 @@ add_buttons (CajaColumnChooser *chooser) GtkWidget *box; GtkWidget *separator; - box = gtk_vbox_new (FALSE, 8); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_widget_show (box); chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP, @@ -402,11 +394,7 @@ add_buttons (CajaColumnChooser *chooser) gtk_box_pack_start (GTK_BOX (box), chooser->details->move_down_button, FALSE, FALSE, 0); -#if GTK_CHECK_VERSION (3, 0, 0) separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); -#else - separator = gtk_hseparator_new (); -#endif gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 0); @@ -478,9 +466,7 @@ caja_column_chooser_init (CajaColumnChooser *chooser) g_object_set (G_OBJECT (chooser), "homogeneous", FALSE, "spacing", 8, -#if GTK_CHECK_VERSION (3, 0, 0) "orientation", GTK_ORIENTATION_HORIZONTAL, -#endif NULL); add_tree_view (chooser); -- cgit v1.2.1