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-emblem-sidebar.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-emblem-sidebar.c')
| -rw-r--r-- | src/caja-emblem-sidebar.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index 75e9f61f..0c5b0056 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -64,10 +64,6 @@ struct CajaEmblemSidebarDetails #define STANDARD_EMBLEM_HEIGHT 52 #define EMBLEM_LABEL_SPACING 2 -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) -#endif - static void caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar); static void caja_emblem_sidebar_refresh (CajaEmblemSidebar *emblem_sidebar); static void caja_emblem_sidebar_iface_init (CajaSidebarIface *iface); @@ -111,11 +107,7 @@ typedef struct GObjectClass parent; } CajaEmblemSidebarProviderClass; -#if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE_WITH_CODE (CajaEmblemSidebar, caja_emblem_sidebar, GTK_TYPE_BOX, -#else -G_DEFINE_TYPE_WITH_CODE (CajaEmblemSidebar, caja_emblem_sidebar, GTK_TYPE_VBOX, -#endif G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, caja_emblem_sidebar_iface_init)); @@ -314,7 +306,7 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar, FALSE, FALSE, 8); - hbox = gtk_hbox_new (FALSE, 8); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 8); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); @@ -588,7 +580,7 @@ create_add_emblems_dialog (CajaEmblemSidebar *emblem_sidebar, image = gtk_image_new_from_pixbuf (emblem->pixbuf); - hbox = gtk_hbox_new (TRUE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); entry = gtk_entry_new (); @@ -1047,9 +1039,7 @@ caja_emblem_sidebar_init (CajaEmblemSidebar *emblem_sidebar) "emblems_changed", G_CALLBACK (emblems_changed_callback), emblem_sidebar, 0); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_orientable_set_orientation (GTK_ORIENTABLE (emblem_sidebar), GTK_ORIENTATION_VERTICAL); -#endif gtk_box_pack_start (GTK_BOX (emblem_sidebar), widget, TRUE, TRUE, 0); } |