From b4826d2439153ed3d2ca0740040ca8f5a2b79b88 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Mon, 28 Oct 2013 11:18:08 +0100
Subject: Fix gtk_*box_new deprecations

---
 src/math-converter.c      |  4 ++++
 src/math-display.c        |  8 ++++++++
 src/math-variable-popup.c | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/src/math-converter.c b/src/math-converter.c
index 2f543fe..f72e9c1 100644
--- a/src/math-converter.c
+++ b/src/math-converter.c
@@ -391,7 +391,11 @@ math_converter_init(MathConverter *converter)
 
     gtk_box_set_spacing(GTK_BOX(converter), 6);
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
     hbox = gtk_hbox_new(FALSE, 0);
+#endif
     gtk_widget_show(hbox);
     gtk_box_pack_start(GTK_BOX(converter), hbox, FALSE, TRUE, 0);
 
diff --git a/src/math-display.c b/src/math-display.c
index fb5af8b..004f909 100644
--- a/src/math-display.c
+++ b/src/math-display.c
@@ -326,7 +326,11 @@ create_gui(MathDisplay *display)
     int i;
     GtkStyle *style;
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+    main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+#else
     main_box = gtk_vbox_new(FALSE, 0);
+#endif
     gtk_container_add(GTK_CONTAINER(display), main_box);
 
     g_signal_connect(display, "key-press-event", G_CALLBACK(key_press_cb), display);
@@ -350,7 +354,11 @@ create_gui(MathDisplay *display)
     g_signal_connect(display->priv->text_view, "key-press-event", G_CALLBACK(display_key_press_cb), display);
     gtk_box_pack_start(GTK_BOX(main_box), display->priv->text_view, TRUE, TRUE, 0);
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+    info_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+#else
     info_box = gtk_hbox_new(FALSE, 6);
+#endif
     gtk_box_pack_start(GTK_BOX(main_box), info_box, FALSE, TRUE, 0);
 
     info_view = gtk_text_view_new();
diff --git a/src/math-variable-popup.c b/src/math-variable-popup.c
index 1287f7a..2ad7e1f 100644
--- a/src/math-variable-popup.c
+++ b/src/math-variable-popup.c
@@ -131,7 +131,11 @@ make_variable_entry(MathVariablePopup *popup, const gchar *name, const MPNumber
     GtkWidget *hbox, *button, *label;
     gchar *text;
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+#else
     hbox = gtk_hbox_new(FALSE, 6);
+#endif
 
     if (value)
     {
@@ -211,7 +215,11 @@ math_variable_popup_set_property(GObject      *object,
         }
         g_strfreev(names);
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+        entry = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+#else
         entry = gtk_hbox_new(FALSE, 6);
+#endif
         gtk_widget_show(entry);
 
         // TODO: Show greyed "variable name" text to give user a hint how to use
@@ -301,7 +309,11 @@ math_variable_popup_init(MathVariablePopup *popup)
     /* Destroy this window when it loses focus */
     g_signal_connect(G_OBJECT(popup), "focus-out-event", G_CALLBACK(variable_focus_out_event_cb), popup);
 
+#if GTK_CHECK_VERSION (3, 2, 0)
+    popup->priv->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+#else
     popup->priv->vbox = gtk_vbox_new(FALSE, 6);
+#endif
     gtk_box_set_homogeneous(GTK_BOX(popup->priv->vbox), TRUE);
     gtk_container_add(GTK_CONTAINER(popup), popup->priv->vbox);
     gtk_widget_show(popup->priv->vbox);
-- 
cgit v1.2.1