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-x-content-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-x-content-bar.c')
| -rw-r--r-- | src/caja-x-content-bar.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c index 1fc8aabe..8c834215 100644 --- a/src/caja-x-content-bar.c +++ b/src/caja-x-content-bar.c @@ -50,11 +50,7 @@ enum PROP_X_CONTENT_TYPE, }; -#if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE (CajaXContentBar, caja_x_content_bar, GTK_TYPE_BOX) -#else -G_DEFINE_TYPE (CajaXContentBar, caja_x_content_bar, GTK_TYPE_HBOX) -#endif void caja_x_content_bar_set_x_content_type (CajaXContentBar *bar, const char *x_content_type) @@ -308,9 +304,9 @@ caja_x_content_bar_init (CajaXContentBar *bar) bar->priv->label = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL (bar->priv->label), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 0, 0) + gtk_orientable_set_orientation (GTK_ORIENTABLE (bar), GTK_ORIENTATION_HORIZONTAL); -#endif + #if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); #else |