From 11faa5bb63005322d016aa0c76653985d0468b42 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sat, 21 Nov 2015 13:02:46 +0100 Subject: Don't use deprecated gtk_{vh}box and GTK_TYPE_{VH}BOX --- src/math-buttons.c | 4 +++- src/math-converter.c | 4 +++- src/math-window.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/math-buttons.c b/src/math-buttons.c index 518a487..92c8ef1 100644 --- a/src/math-buttons.c +++ b/src/math-buttons.c @@ -58,7 +58,7 @@ struct MathButtonsPrivate GtkWidget *character_code_entry; }; -G_DEFINE_TYPE (MathButtons, math_buttons, GTK_TYPE_VBOX); +G_DEFINE_TYPE (MathButtons, math_buttons, GTK_TYPE_BOX); #define UI_BASIC_FILE UI_DIR "/buttons-basic.ui" #define UI_ADVANCED_FILE UI_DIR "/buttons-advanced.ui" @@ -1367,6 +1367,8 @@ math_buttons_init(MathButtons *buttons) { buttons->priv = G_TYPE_INSTANCE_GET_PRIVATE(buttons, math_buttons_get_type(), MathButtonsPrivate); gtk_box_set_spacing(GTK_BOX(buttons), 6); + gtk_orientable_set_orientation (GTK_ORIENTABLE (buttons), + GTK_ORIENTATION_VERTICAL); buttons->priv->programming_base = 10; g_signal_connect(G_OBJECT(buttons), "show", G_CALLBACK(load_buttons), NULL); } diff --git a/src/math-converter.c b/src/math-converter.c index ff28500..7badc5e 100644 --- a/src/math-converter.c +++ b/src/math-converter.c @@ -33,7 +33,7 @@ struct MathConverterPrivate }; -G_DEFINE_TYPE (MathConverter, math_converter, GTK_TYPE_HBOX); +G_DEFINE_TYPE (MathConverter, math_converter, GTK_TYPE_BOX); static void display_changed_cb(MathEquation *equation, GParamSpec *spec, MathConverter *converter); static void update_from_model(MathConverter *converter); @@ -390,6 +390,8 @@ math_converter_init(MathConverter *converter) converter->priv = G_TYPE_INSTANCE_GET_PRIVATE(converter, math_converter_get_type(), MathConverterPrivate); gtk_box_set_spacing(GTK_BOX(converter), 6); + gtk_orientable_set_orientation (GTK_ORIENTABLE (converter), + GTK_ORIENTATION_HORIZONTAL); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(hbox); diff --git a/src/math-window.c b/src/math-window.c index 990246d..687e2ac 100644 --- a/src/math-window.c +++ b/src/math-window.c @@ -415,7 +415,7 @@ create_gui(MathWindow *window) GtkWidget *main_vbox, *vbox; GtkWidget *scrolled_window; - main_vbox = gtk_vbox_new(FALSE, 0); + main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_container_add(GTK_CONTAINER(window), main_vbox); gtk_widget_show(main_vbox); @@ -425,7 +425,7 @@ create_gui(MathWindow *window) create_menu(window); - vbox = gtk_vbox_new(FALSE, 6); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_box_pack_start(GTK_BOX(main_vbox), vbox, TRUE, TRUE, 0); gtk_widget_show(vbox); -- cgit v1.2.1