diff options
| author | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
| commit | 276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch) | |
| tree | 544f41e76c9a91973867065696fc2e414ca60170 /src/caja-window-slot.c | |
| parent | 969e4d021fe49654fe6e5ee7e88c920fec126505 (diff) | |
| download | caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2 caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz | |
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
Diffstat (limited to 'src/caja-window-slot.c')
| -rw-r--r-- | src/caja-window-slot.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c index e7d53f2a..6286a5e3 100644 --- a/src/caja-window-slot.c +++ b/src/caja-window-slot.c @@ -33,10 +33,6 @@ #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) -#endif - static void caja_window_slot_init (CajaWindowSlot *slot); static void caja_window_slot_class_init (CajaWindowSlotClass *class); static void caja_window_slot_dispose (GObject *object); @@ -184,7 +180,7 @@ caja_window_slot_init (CajaWindowSlot *slot) { GtkWidget *content_box, *eventbox, *extras_vbox, *frame; - content_box = gtk_vbox_new (FALSE, 0); + content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); slot->content_box = content_box; gtk_widget_show (content_box); @@ -198,13 +194,13 @@ caja_window_slot_init (CajaWindowSlot *slot) gtk_container_add (GTK_CONTAINER (frame), eventbox); gtk_widget_show (eventbox); - extras_vbox = gtk_vbox_new (FALSE, 6); + extras_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (extras_vbox), 6); slot->extra_location_widgets = extras_vbox; gtk_container_add (GTK_CONTAINER (eventbox), extras_vbox); gtk_widget_show (extras_vbox); - slot->view_box = gtk_vbox_new (FALSE, 0); + slot->view_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (content_box), slot->view_box, TRUE, TRUE, 0); gtk_widget_show (slot->view_box); @@ -483,13 +479,8 @@ caja_window_slot_set_content_view_widget (CajaWindowSlot *slot, if (new_view != NULL) { widget = caja_view_get_widget (new_view); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_box_pack_start (GTK_BOX (slot->view_box), widget, TRUE, TRUE, 0); -#else - gtk_container_add (GTK_CONTAINER (slot->view_box), - GTK_WIDGET (new_view)); -#endif gtk_widget_show (widget); |