summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-21 00:25:35 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-23 03:59:55 +0100
commit709163687da777a4489b48d4a1f3da4637bab111 (patch)
tree94fcea1558c984d10575714a7fbc44eaed2b411d /src
parent610b1913c3f4cfc082c52bada71731aaca8ffcd4 (diff)
downloadcaja-709163687da777a4489b48d4a1f3da4637bab111.tar.bz2
caja-709163687da777a4489b48d4a1f3da4637bab111.tar.xz
GTK3 property-browser: don't use GtkHBox for both toolkits +
don't use deprecated gtk_hbox_new for gtk3
Diffstat (limited to 'src')
-rw-r--r--src/caja-property-browser.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index 12248e08..253e6303 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -67,7 +67,7 @@ typedef enum
struct CajaPropertyBrowserDetails
{
- GtkHBox *container;
+ GtkWidget *container;
GtkWidget *content_container;
GtkWidget *content_frame;
@@ -183,6 +183,7 @@ static GdkPixbuf * make_color_drag_image (CajaPropertyBro
#define ERASE_OBJECT_NAME "erase.png"
#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
#endif
@@ -305,10 +306,10 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
gtk_container_add (GTK_CONTAINER (property_browser), vbox);
/* create the container box */
- property_browser->details->container = GTK_HBOX (gtk_hbox_new (FALSE, 6));
+ property_browser->details->container = gtk_hbox_new (FALSE, 6);
gtk_widget_show (GTK_WIDGET (property_browser->details->container));
gtk_box_pack_start (GTK_BOX (vbox),
- GTK_WIDGET (property_browser->details->container),
+ property_browser->details->container,
TRUE, TRUE, 0);
/* make the category container */
@@ -351,11 +352,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
gtk_widget_show(temp_frame);
gtk_container_add(GTK_CONTAINER(property_browser->details->title_box), temp_frame);
-#if GTK_CHECK_VERSION (3, 0, 0)
- temp_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
temp_hbox = gtk_hbox_new(FALSE, 0);
-#endif
gtk_widget_show(temp_hbox);
gtk_container_add(GTK_CONTAINER(temp_frame), temp_hbox);
@@ -380,11 +377,7 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser)
temp_box = gtk_event_box_new();
gtk_widget_show(temp_box);
-#if GTK_CHECK_VERSION (3, 0, 0)
- property_browser->details->bottom_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
property_browser->details->bottom_box = gtk_hbox_new (FALSE, 6);
-#endif
gtk_widget_show (property_browser->details->bottom_box);
gtk_box_pack_end (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
@@ -1157,11 +1150,7 @@ caja_emblem_dialog_new (CajaPropertyBrowser *property_browser)
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-#if GTK_CHECK_VERSION (3, 0, 0)
- widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
widget = gtk_hbox_new (FALSE, 0);
-#endif
gtk_widget_show (widget);
button = gtk_button_new ();