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-search-bar.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src/caja-search-bar.c') diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c index bbe1be02..af0531ea 100644 --- a/src/caja-search-bar.c +++ b/src/caja-search-bar.c @@ -29,10 +29,6 @@ #include #include -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) -#endif - struct CajaSearchBarDetails { GtkWidget *entry; @@ -154,42 +150,23 @@ focus_in_event_callback (GtkWidget *widget, static void caja_search_bar_init (CajaSearchBar *bar) { -#if !GTK_CHECK_VERSION(3, 0, 0) - GtkWidget *alignment; -#endif GtkWidget *hbox; GtkWidget *label; -#if GTK_CHECK_VERSION(3, 0, 0) GtkStyleContext *context; context = gtk_widget_get_style_context (GTK_WIDGET (bar)); gtk_style_context_add_class (context, "caja-search-bar"); -#endif bar->details = g_new0 (CajaSearchBarDetails, 1); gtk_event_box_set_visible_window (GTK_EVENT_BOX (bar), FALSE); -#if GTK_CHECK_VERSION(3, 0, 0) - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_set_margin_start (hbox, 6); gtk_widget_set_margin_end (hbox, 6); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (bar), hbox); -#else - alignment = gtk_alignment_new (0.5, 0.5, - 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), - 0, 0, 6, 6); - gtk_widget_show (alignment); - gtk_container_add (GTK_CONTAINER (bar), alignment); - - hbox = gtk_hbox_new (FALSE, 6); - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (alignment), hbox); -#endif - label = gtk_label_new (_("Search:")); gtk_widget_show (label); -- cgit v1.2.1