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-trash-bar.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-trash-bar.c')
| -rw-r--r-- | src/caja-trash-bar.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c index 25630612..53f9ebcd 100644 --- a/src/caja-trash-bar.c +++ b/src/caja-trash-bar.c @@ -51,11 +51,7 @@ struct CajaTrashBarPrivate gulong selection_handler_id; }; -#if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE (CajaTrashBar, caja_trash_bar, GTK_TYPE_BOX); -#else -G_DEFINE_TYPE (CajaTrashBar, caja_trash_bar, GTK_TYPE_HBOX); -#endif static void restore_button_clicked_cb (GtkWidget *button, @@ -193,9 +189,9 @@ caja_trash_bar_init (CajaTrashBar *bar) label = gtk_label_new (_("Trash")); gtk_widget_show (label); -#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (bar), GTK_ORIENTATION_HORIZONTAL); -#endif + gtk_box_pack_start (GTK_BOX (bar), label, FALSE, FALSE, 0); bar->priv->empty_button = gtk_button_new_with_mnemonic (_("Empty _Trash")); |