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 --- src/caja-view-as-action.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/caja-view-as-action.c') diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index 9325f607..d03cfa63 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -42,10 +42,6 @@ static GObjectClass *parent_class = NULL; #define CAJA_VIEW_AS_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), CAJA_TYPE_VIEW_AS_ACTION, CajaViewAsActionPrivate)) -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - struct CajaViewAsActionPrivate { CajaNavigationWindow *window; @@ -177,7 +173,7 @@ connect_proxy (GtkAction *action, /* Option menu for content view types; it's empty here, filled in when a uri is set. * Pack it into vbox so it doesn't grow vertically when location bar does. */ - view_as_menu_vbox = gtk_vbox_new (FALSE, 4); + view_as_menu_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (view_as_menu_vbox); gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox); -- cgit v1.2.1