From 409e43715ae8bcec80334c945c77b4e29b127ae6 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 16 Jun 2017 12:10:36 +0100 Subject: [PATCH] Change all the GtkHbox widgets Change all GtkHBox widgets to GtkBox with orientation HORIZONTAL --- .../business-gnome/business-options-gnome.c | 24 +++++-- src/business/business-gnome/dialog-invoice.c | 6 +- src/business/business-gnome/search-owner.c | 6 +- src/gnome-search/dialog-search.c | 4 +- src/gnome-search/gnc-general-search.c | 6 +- src/gnome-search/gnc-general-search.h | 4 +- src/gnome-search/search-account.c | 3 +- src/gnome-search/search-boolean.c | 3 +- src/gnome-search/search-date.c | 3 +- src/gnome-search/search-double.c | 3 +- src/gnome-search/search-int64.c | 3 +- src/gnome-search/search-numeric.c | 3 +- src/gnome-search/search-reconciled.c | 3 +- src/gnome-search/search-string.c | 3 +- src/gnome-utils/dialog-account.c | 3 +- src/gnome-utils/dialog-options.c | 63 ++++++++++++------- src/gnome-utils/dialog-preferences.c | 2 +- src/gnome-utils/gnc-account-sel.c | 6 +- src/gnome-utils/gnc-account-sel.h | 4 +- .../gnc-cell-renderer-popup-entry.c | 3 +- src/gnome-utils/gnc-combott.c | 7 ++- src/gnome-utils/gnc-combott.h | 2 +- src/gnome-utils/gnc-date-delta.c | 6 +- src/gnome-utils/gnc-date-delta.h | 4 +- src/gnome-utils/gnc-date-edit.c | 11 ++-- src/gnome-utils/gnc-date-edit.h | 4 +- src/gnome-utils/gnc-date-format.c | 6 +- src/gnome-utils/gnc-date-format.h | 4 +- src/gnome-utils/gnc-general-select.c | 8 ++- src/gnome-utils/gnc-general-select.h | 4 +- src/gnome-utils/gnc-main-window.c | 2 +- src/gnome-utils/gnc-period-select.c | 4 +- src/gnome-utils/gnc-period-select.h | 4 +- src/gnome-utils/gnc-recurrence.c | 6 +- src/gnome-utils/gnc-splash.c | 3 +- src/gnome-utils/window-main-summarybar.c | 4 +- src/gnome/assistant-loan.c | 12 ++-- src/gnome/gnc-split-reg.c | 6 +- src/gnome/gnc-split-reg2.c | 9 ++- src/gnome/window-reconcile.c | 9 ++- src/gnome/window-reconcile2.c | 9 ++- .../csv-exp/assistant-csv-export.c | 3 +- .../csv-imp/assistant-csv-account-import.c | 3 +- .../csv-imp/assistant-csv-trans-import.cpp | 4 +- src/import-export/import-account-matcher.c | 5 +- 45 files changed, 191 insertions(+), 103 deletions(-) diff --git a/src/business/business-gnome/business-options-gnome.c b/src/business/business-gnome/business-options-gnome.c index fdff45e4d0..265f595c09 100644 --- a/src/business/business-gnome/business-options-gnome.c +++ b/src/business/business-gnome/business-options-gnome.c @@ -114,7 +114,9 @@ owner_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); @@ -183,7 +185,9 @@ customer_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); @@ -241,7 +245,9 @@ vendor_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); @@ -298,7 +304,9 @@ employee_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); @@ -372,7 +380,9 @@ invoice_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); @@ -450,7 +460,9 @@ taxtable_set_widget (GNCOption *option, GtkBox *page_box, GtkWidget *value; GtkWidget *label; - *enclosing = gtk_hbox_new (FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); + label = make_name_label (name); gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0); diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 99b37195db..9661a15f27 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -1204,7 +1204,8 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) GtkWidget *hbox; GtkWidget *label; - hbox = gtk_hbox_new(FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start (GTK_BOX(summarybar), hbox, FALSE, FALSE, 5); label = gtk_label_new (label_str); @@ -1229,7 +1230,8 @@ gnc_invoice_window_create_summary_bar (InvoiceWindow *iw) iw->total_subtotal_label = NULL; iw->total_tax_label = NULL; - summarybar = gtk_hbox_new (FALSE, 4); + summarybar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + gtk_box_set_homogeneous (GTK_BOX (summarybar), FALSE); iw->total_label = add_summary_label (summarybar, _("Total:")); diff --git a/src/business/business-gnome/search-owner.c b/src/business/business-gnome/search-owner.c index 7729fccfe9..1d63761af0 100644 --- a/src/business/business-gnome/search-owner.c +++ b/src/business/business-gnome/search-owner.c @@ -274,14 +274,16 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_OWNER (fi), NULL); priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the "how" option menu. */ how_menu = make_how_menu (fe); gtk_box_pack_start (GTK_BOX (box), how_menu, FALSE, FALSE, 3); /* Create the owner box */ - priv->owner_box = gtk_hbox_new (FALSE, 0); + priv->owner_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->owner_box), FALSE); /* Build and connect the "type" option menu. * Note that this will build the owner_choice and diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index 1f1e2776f2..e0e59c5631 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -852,7 +852,9 @@ get_element_widget (GNCSearchWindow *sw, GNCSearchCoreType *element) data->element = element; data->dialog = GTK_DIALOG (sw->dialog); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); + /* only set to automatically clean up the memory */ g_object_set_data_full (G_OBJECT (hbox), "data", data, g_free); diff --git a/src/gnome-search/gnc-general-search.c b/src/gnome-search/gnc-general-search.c index 5ab332e9ed..8807d2b26c 100644 --- a/src/gnome-search/gnc-general-search.c +++ b/src/gnome-search/gnc-general-search.c @@ -77,7 +77,7 @@ struct _GNCGeneralSearchPrivate #define _PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_GENERAL_SEARCH, GNCGeneralSearchPrivate)) -static GtkHBoxClass *parent_class; +static GtkBoxClass *parent_class; static guint general_search_signals[LAST_SIGNAL]; @@ -106,7 +106,7 @@ gnc_general_search_get_type (void) (GInstanceInitFunc) gnc_general_search_init, }; - general_search_type = g_type_register_static (GTK_TYPE_HBOX, + general_search_type = g_type_register_static (GTK_TYPE_BOX, "GNCGeneralSearch", &our_info, 0); } @@ -140,6 +140,8 @@ gnc_general_search_class_init (GNCGeneralSearchClass *klass) static void gnc_general_search_init (GNCGeneralSearch *gsl) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gsl), GTK_ORIENTATION_HORIZONTAL); + gsl->selected_item = NULL; } diff --git a/src/gnome-search/gnc-general-search.h b/src/gnome-search/gnc-general-search.h index 09a4b4ae58..adba80809f 100644 --- a/src/gnome-search/gnc-general-search.h +++ b/src/gnome-search/gnc-general-search.h @@ -55,7 +55,7 @@ typedef GNCSearchWindow *(*GNCSearchCB) (gpointer start, gpointer user_data); typedef struct { - GtkHBox hbox; + GtkBox hbox; GtkWidget * entry; /* display of selection name */ GtkWidget * button; /* button for popping up search window */ @@ -67,7 +67,7 @@ typedef struct typedef struct { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*changed) (GNCGeneralSearch *edit); } GNCGeneralSearchClass; diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index b149507a0a..9ec6579e22 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -296,7 +296,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (fi, NULL); g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fi), NULL); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-search/search-boolean.c b/src/gnome-search/search-boolean.c index 59dc2cbd68..a784c1244c 100644 --- a/src/gnome-search/search-boolean.c +++ b/src/gnome-search/search-boolean.c @@ -171,7 +171,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (fi, NULL); g_return_val_if_fail (IS_GNCSEARCH_BOOLEAN (fi), NULL); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the toggle */ toggle = gtk_check_button_new (); diff --git a/src/gnome-search/search-date.c b/src/gnome-search/search-date.c index 3a3e5aaeb0..b78b632b01 100644 --- a/src/gnome-search/search-date.c +++ b/src/gnome-search/search-date.c @@ -243,7 +243,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_DATE (fi), NULL); priv = _PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-search/search-double.c b/src/gnome-search/search-double.c index d87626fe4f..e6c45ff507 100644 --- a/src/gnome-search/search-double.c +++ b/src/gnome-search/search-double.c @@ -235,7 +235,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_DOUBLE (fi), NULL); priv = _PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-search/search-int64.c b/src/gnome-search/search-int64.c index 943fdcdbf5..bc94f616fe 100644 --- a/src/gnome-search/search-int64.c +++ b/src/gnome-search/search-int64.c @@ -237,7 +237,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_INT64 (fi), NULL); priv = _PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-search/search-numeric.c b/src/gnome-search/search-numeric.c index 7778541568..582e17c8a8 100644 --- a/src/gnome-search/search-numeric.c +++ b/src/gnome-search/search-numeric.c @@ -298,7 +298,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_NUMERIC (fi), NULL); priv = _PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu(s) */ if (priv->is_debcred) diff --git a/src/gnome-search/search-reconciled.c b/src/gnome-search/search-reconciled.c index 609db6bde1..2b9ffe6e80 100644 --- a/src/gnome-search/search-reconciled.c +++ b/src/gnome-search/search-reconciled.c @@ -216,7 +216,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (fi, NULL); g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fi), NULL); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-search/search-string.c b/src/gnome-search/search-string.c index 4fbb62dff6..1ba224cbb6 100644 --- a/src/gnome-search/search-string.c +++ b/src/gnome-search/search-string.c @@ -312,7 +312,8 @@ gncs_get_widget (GNCSearchCoreType *fe) g_return_val_if_fail (IS_GNCSEARCH_STRING (fi), NULL); priv = _PRIVATE(fi); - box = gtk_hbox_new (FALSE, 3); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); /* Build and connect the option menu */ menu = make_menu (fe); diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 79cbccc1ac..f821474e6f 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -649,7 +649,8 @@ verify_children_compatible (AccountWindow *aw) gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c index 1213197f84..f9485a0163 100644 --- a/src/gnome-utils/dialog-options.c +++ b/src/gnome-utils/dialog-options.c @@ -708,7 +708,8 @@ gnc_option_create_date_widget (GNCOption *option) } else if (g_strcmp0(type, "both") == 0) { - box = gtk_hbox_new(FALSE, 5); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); ab_button = gtk_radio_button_new(NULL); g_signal_connect(G_OBJECT(ab_button), "toggled", @@ -820,7 +821,8 @@ gnc_option_create_radiobutton_widget(char *name, GNCOption *option) frame = gtk_frame_new (name); /* Create the button box */ - box = gtk_hbox_new (FALSE, 5); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (box), FALSE); gtk_container_add (GTK_CONTAINER (frame), box); /* Iterate over the options and create a radio button for each one */ @@ -891,7 +893,8 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option) gtk_widget_set_tooltip_text(widget, tip && *tip ? _(tip) : ""); /* Use hbox & vbox2 for all buttons so they are all at the same level; easier to get in set/get ui functions */ - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE); @@ -1195,7 +1198,8 @@ gnc_option_create_list_widget(GNCOption *option, char *name) gint i; frame = gtk_frame_new(name); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_container_add(GTK_CONTAINER(frame), hbox); store = gtk_list_store_new(1, G_TYPE_STRING); @@ -1891,7 +1895,8 @@ gnc_option_set_ui_widget_boolean (GNCOption *option, GtkBox *page_box, { GtkWidget *value; - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gtk_check_button_new_with_label(name); gnc_option_set_widget (option, value); @@ -1921,7 +1926,8 @@ gnc_option_set_ui_widget_string (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gtk_entry_new(); gnc_option_set_widget (option, value); @@ -1957,7 +1963,8 @@ gnc_option_set_ui_widget_text (GNCOption *option, GtkBox *page_box, gtk_container_add(GTK_CONTAINER(frame), scroll); - *enclosing = gtk_hbox_new(FALSE, 10); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gtk_text_view_new(); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(value), GTK_WRAP_WORD); gtk_text_view_set_editable(GTK_TEXT_VIEW(value), TRUE); @@ -1990,7 +1997,8 @@ gnc_option_set_ui_widget_currency (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_currency_edit_new(); gnc_option_set_widget (option, value); @@ -2020,7 +2028,8 @@ gnc_option_set_ui_widget_commodity (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_general_select_new(GNC_GENERAL_SELECT_TYPE_SELECT, gnc_commodity_edit_get_string, gnc_commodity_edit_new_select, @@ -2057,7 +2066,8 @@ gnc_option_set_ui_widget_multichoice (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_option_create_multichoice_widget(option); gnc_option_set_widget (option, value); @@ -2085,7 +2095,8 @@ gnc_option_set_ui_widget_date (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_option_create_date_widget(option); @@ -2167,7 +2178,8 @@ gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkBox *page_box, TRUE? */ gnc_option_set_ui_value(option, TRUE); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); gtk_box_pack_start(GTK_BOX(*enclosing), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0); gtk_widget_show_all(*enclosing); @@ -2220,7 +2232,8 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); gnc_option_get_range_info(option, &lower_bound, &upper_bound, &num_decimals, &step_size); @@ -2281,7 +2294,8 @@ gnc_option_set_ui_widget_color (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); use_alpha = gnc_option_use_alpha(option); @@ -2316,7 +2330,8 @@ gnc_option_set_ui_widget_font (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gtk_font_button_new(); g_object_set(G_OBJECT(value), "use-font", TRUE, @@ -2354,7 +2369,8 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); button = gtk_button_new_with_label(_("Clear")); gtk_widget_set_tooltip_text(button, _("Clear any selected image file.")); @@ -2397,7 +2413,8 @@ gnc_option_set_ui_widget_radiobutton (GNCOption *option, GtkBox *page_box, { GtkWidget *value; - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_option_create_radiobutton_widget(name, option); gnc_option_set_widget (option, value); @@ -2493,9 +2510,11 @@ gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); gtk_box_pack_start(GTK_BOX(*enclosing), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(*enclosing), hbox, FALSE, FALSE, 0); @@ -2582,7 +2601,8 @@ gnc_option_set_ui_widget_budget (GNCOption *option, GtkBox *page_box, gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); g_free(colon_name); - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_option_create_budget_widget(option); @@ -2609,7 +2629,8 @@ gnc_option_set_ui_widget_currency_accounting (GNCOption *option, { GtkWidget *value; - *enclosing = gtk_hbox_new(FALSE, 5); + *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE); value = gnc_option_create_currency_accounting_widget(name, option); gnc_option_set_widget (option, value); diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c index e521af9026..8f295936e9 100644 --- a/src/gnome-utils/dialog-preferences.c +++ b/src/gnome-utils/dialog-preferences.c @@ -1144,7 +1144,7 @@ gnc_prefs_connect_one (const gchar *name, DEBUG(" %s - entry", name); gnc_prefs_connect_entry(GTK_ENTRY(widget)); } - else if (GTK_IS_HBOX(widget)) + else if (GTK_IS_BOX(widget)) { /* Test custom widgets are all children of a hbox */ GtkWidget *widget_child; diff --git a/src/gnome-utils/gnc-account-sel.c b/src/gnome-utils/gnc-account-sel.c index 087146c221..5ff25a3486 100644 --- a/src/gnome-utils/gnc-account-sel.c +++ b/src/gnome-utils/gnc-account-sel.c @@ -65,7 +65,7 @@ static void gas_populate_list (GNCAccountSel *gas); static void gas_new_account_click (GtkButton *b, gpointer ud); -static GtkHBox *parent_class; +static GtkBox *parent_class; GType gnc_account_sel_get_type (void) @@ -87,7 +87,7 @@ gnc_account_sel_get_type (void) (GInstanceInitFunc) gnc_account_sel_init }; - account_sel_type = g_type_register_static (GTK_TYPE_HBOX, + account_sel_type = g_type_register_static (GTK_TYPE_BOX, "GNCAccountSel", &account_sel_info, 0); } @@ -146,6 +146,8 @@ gnc_account_sel_init (GNCAccountSel *gas) { GtkWidget *widget; + gtk_orientable_set_orientation (GTK_ORIENTABLE(gas), GTK_ORIENTATION_HORIZONTAL); + gas->initDone = FALSE; gas->acctTypeFilters = FALSE; gas->newAccountButton = NULL; diff --git a/src/gnome-utils/gnc-account-sel.h b/src/gnome-utils/gnc-account-sel.h index 8e859a2994..8fea7e90c5 100644 --- a/src/gnome-utils/gnc-account-sel.h +++ b/src/gnome-utils/gnc-account-sel.h @@ -40,7 +40,7 @@ typedef struct { - GtkHBox hbox; + GtkBox hbox; gboolean initDone; gboolean isModal; GtkListStore *store; @@ -59,7 +59,7 @@ typedef struct typedef struct { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; /* Signals for notification/filtering of changes */ void (*account_sel_changed) (GNCAccountSel *gas); diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c index 322c378e18..4f675f7cfe 100644 --- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c +++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c @@ -97,7 +97,8 @@ gnc_popup_entry_init (GncPopupEntry *widget) { GtkWidget *arrow; - widget->hbox = gtk_hbox_new (FALSE, 0); + widget->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (widget->hbox), FALSE); gtk_widget_show (widget->hbox); widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL); diff --git a/src/gnome-utils/gnc-combott.c b/src/gnome-utils/gnc-combott.c index 119072ceca..e6b60c8cf0 100644 --- a/src/gnome-utils/gnc-combott.c +++ b/src/gnome-utils/gnc-combott.c @@ -134,7 +134,7 @@ gnc_combott_get_type (void) (GInstanceInitFunc) gctt_init, }; - combott_type = g_type_register_static (GTK_TYPE_HBOX, + combott_type = g_type_register_static (GTK_TYPE_BOX, "GncCombott", &combott_info, 0); } @@ -211,11 +211,14 @@ gctt_init (GncCombott *combott) GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott); + gtk_orientable_set_orientation (GTK_ORIENTABLE(combott), GTK_ORIENTATION_HORIZONTAL); + priv->active = 0; priv->text_col = 0; priv->tip_col = 1; - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT); gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0); diff --git a/src/gnome-utils/gnc-combott.h b/src/gnome-utils/gnc-combott.h index 0d18ff32e1..284021de3b 100644 --- a/src/gnome-utils/gnc-combott.h +++ b/src/gnome-utils/gnc-combott.h @@ -46,7 +46,7 @@ typedef struct _GncCombottClass GncCombottClass; struct _GncCombott { - GtkHBox hbox; + GtkBox hbox; }; struct _GncCombottClass diff --git a/src/gnome-utils/gnc-date-delta.c b/src/gnome-utils/gnc-date-delta.c index 7a13acf3c5..dfac3e7103 100644 --- a/src/gnome-utils/gnc-date-delta.c +++ b/src/gnome-utils/gnc-date-delta.c @@ -65,7 +65,7 @@ static void gnc_date_delta_forall (GtkContainer *container, GtkCallback callback, gpointer callbabck_data); -static GtkHBoxClass *parent_class; +static GtkBoxClass *parent_class; /** * gnc_date_delta_get_type: @@ -92,7 +92,7 @@ gnc_date_delta_get_type (void) (GInstanceInitFunc) gnc_date_delta_init }; - date_delta_type = g_type_register_static (gtk_hbox_get_type (), + date_delta_type = g_type_register_static (gtk_box_get_type (), "GNCDateDelta", &date_delta_info, 0); @@ -159,6 +159,8 @@ gnc_date_delta_class_init (GNCDateDeltaClass *klass) static void gnc_date_delta_init (GNCDateDelta *gdd) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gdd), GTK_ORIENTATION_HORIZONTAL); + gdd->value_spin = NULL; gdd->units_combo = NULL; gdd->polarity_combo = NULL; diff --git a/src/gnome-utils/gnc-date-delta.h b/src/gnome-utils/gnc-date-delta.h index 67d6cd019e..f749747ddb 100644 --- a/src/gnome-utils/gnc-date-delta.h +++ b/src/gnome-utils/gnc-date-delta.h @@ -54,7 +54,7 @@ typedef enum typedef struct { - GtkHBox hbox; + GtkBox hbox; GtkWidget *value_spin; GtkWidget *units_combo; @@ -68,7 +68,7 @@ typedef struct typedef struct { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*value_changed) (GNCDateDelta *gdd); void (*units_changed) (GNCDateDelta *gdd); void (*polarity_changed) (GNCDateDelta *gdd); diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index ba117331d4..ab62aebb76 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -80,7 +80,7 @@ static int date_accel_key_press(GtkWidget *widget, gpointer data); -static GtkHBoxClass *parent_class; +static GtkBoxClass *parent_class; /** * gnc_date_edit_get_type: @@ -108,7 +108,7 @@ gnc_date_edit_get_type (void) NULL, }; - date_edit_type = g_type_register_static (GTK_TYPE_HBOX, + date_edit_type = g_type_register_static (GTK_TYPE_BOX, "GNCDateEdit", &date_edit_info, 0); } @@ -606,7 +606,7 @@ gnc_date_edit_class_init (GNCDateEditClass *klass) object_class->dispose = gnc_date_edit_dispose; object_class->finalize = gnc_date_edit_finalize; - parent_class = g_type_class_ref(GTK_TYPE_HBOX); + parent_class = g_type_class_ref(GTK_TYPE_BOX); date_edit_signals [TIME_CHANGED] = g_signal_new ("time_changed", @@ -643,6 +643,8 @@ gnc_date_edit_class_init (GNCDateEditClass *klass) static void gnc_date_edit_init (GNCDateEdit *gde) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gde), GTK_ORIENTATION_HORIZONTAL); + gde->disposed = FALSE; gde->popup_in_progress = FALSE; gde->lower_hour = 7; @@ -856,7 +858,8 @@ create_children (GNCDateEdit *gde) G_CALLBACK (gnc_date_edit_button_toggled), gde); gtk_box_pack_start (GTK_BOX (gde), gde->date_button, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_container_add (GTK_CONTAINER (gde->date_button), hbox); gtk_widget_show (GTK_WIDGET(hbox)); diff --git a/src/gnome-utils/gnc-date-edit.h b/src/gnome-utils/gnc-date-edit.h index 790dd36d52..f6b7472491 100644 --- a/src/gnome-utils/gnc-date-edit.h +++ b/src/gnome-utils/gnc-date-edit.h @@ -57,7 +57,7 @@ typedef enum **/ typedef struct { - GtkHBox hbox; + GtkBox hbox; GtkWidget *date_entry; GtkWidget *date_button; @@ -84,7 +84,7 @@ typedef struct typedef struct { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*date_changed) (GNCDateEdit *gde); void (*time_changed) (GNCDateEdit *gde); } GNCDateEditClass; diff --git a/src/gnome-utils/gnc-date-format.c b/src/gnome-utils/gnc-date-format.c index db2a098e71..041712eb6c 100644 --- a/src/gnome-utils/gnc-date-format.c +++ b/src/gnome-utils/gnc-date-format.c @@ -87,7 +87,7 @@ static void gnc_date_format_compute_format(GNCDateFormat *gdf); void gnc_ui_date_format_changed_cb(GtkWidget *unused, gpointer user_data); -static GtkHBoxClass *parent_class; +static GtkBoxClass *parent_class; /** * gnc_date_format_get_type: @@ -115,7 +115,7 @@ gnc_date_format_get_type (void) NULL, }; - date_format_type = g_type_register_static(GTK_TYPE_HBOX, + date_format_type = g_type_register_static(GTK_TYPE_BOX, "GNCDateFormat", &date_format_info, 0); } @@ -158,6 +158,8 @@ gnc_date_format_init (GNCDateFormat *gdf) g_return_if_fail(gdf); g_return_if_fail(GNC_IS_DATE_FORMAT(gdf)); + gtk_orientable_set_orientation (GTK_ORIENTABLE(gdf), GTK_ORIENTATION_HORIZONTAL); + /* Open up the Glade and set the signals */ builder = gtk_builder_new(); gnc_builder_add_from_file (builder, "gnc-date-format.glade", "format-liststore"); diff --git a/src/gnome-utils/gnc-date-format.h b/src/gnome-utils/gnc-date-format.h index 12c1bdf35f..41abcc05e6 100644 --- a/src/gnome-utils/gnc-date-format.h +++ b/src/gnome-utils/gnc-date-format.h @@ -40,12 +40,12 @@ **/ typedef struct { - GtkHBox hbox; + GtkBox hbox; } GNCDateFormat; typedef struct { - GtkHBoxClass hbox_class; + GtkBoxClass hbox_class; void (*format_changed) (GNCDateFormat *gdf); } GNCDateFormatClass; diff --git a/src/gnome-utils/gnc-general-select.c b/src/gnome-utils/gnc-general-select.c index ef6deeae31..bee3ac72b9 100644 --- a/src/gnome-utils/gnc-general-select.c +++ b/src/gnome-utils/gnc-general-select.c @@ -51,7 +51,7 @@ static void gnc_general_select_class_init (GNCGeneralSelectClass *klass); static void gnc_general_select_dispose (GObject *object); static void gnc_general_select_finalize (GObject *object); -static GtkHBoxClass *parent_class; +static GtkBoxClass *parent_class; static guint general_select_signals[LAST_SIGNAL]; @@ -81,7 +81,7 @@ gnc_general_select_get_type (void) NULL, }; - general_select_type = g_type_register_static(GTK_TYPE_HBOX, + general_select_type = g_type_register_static(GTK_TYPE_BOX, "GNCGeneralSelect", &general_select_info, 0); } @@ -119,7 +119,7 @@ gnc_general_select_class_init (GNCGeneralSelectClass *klass) object_class = (GObjectClass*) klass; - parent_class = g_type_class_ref(GTK_TYPE_HBOX); + parent_class = g_type_class_ref(GTK_TYPE_BOX); general_select_signals[SELECTION_CHANGED] = g_signal_new("changed", @@ -142,6 +142,8 @@ gnc_general_select_class_init (GNCGeneralSelectClass *klass) static void gnc_general_select_init (GNCGeneralSelect *gsl) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gsl), GTK_ORIENTATION_HORIZONTAL); + gsl->disposed = FALSE; gsl->selected_item = NULL; } diff --git a/src/gnome-utils/gnc-general-select.h b/src/gnome-utils/gnc-general-select.h index 8595f68284..d46e72d2cf 100644 --- a/src/gnome-utils/gnc-general-select.h +++ b/src/gnome-utils/gnc-general-select.h @@ -48,7 +48,7 @@ typedef enum typedef struct { - GtkHBox hbox; + GtkBox hbox; GtkWidget *entry; /* display of selection name */ GtkWidget *button; /* button for popping up selection window */ @@ -64,7 +64,7 @@ typedef struct typedef struct { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*changed) (GNCGeneralSelect *edit); } GNCGeneralSelectClass; diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 9264916a22..7c4ce69771 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -2125,7 +2125,7 @@ main_window_find_tab_items (GncMainWindow *window, page->notebook_page); if (GTK_IS_EVENT_BOX (tab_widget)) tab_hbox = gtk_bin_get_child(GTK_BIN(tab_widget)); - else if (GTK_IS_HBOX (tab_widget)) + else if (GTK_IS_BOX (tab_widget)) tab_hbox = tab_widget; else { diff --git a/src/gnome-utils/gnc-period-select.c b/src/gnome-utils/gnc-period-select.c index 74d70f7267..14bdf80c42 100644 --- a/src/gnome-utils/gnc-period-select.c +++ b/src/gnome-utils/gnc-period-select.c @@ -526,7 +526,7 @@ gnc_period_select_get_type (void) NULL }; - period_select_type = g_type_register_static(GTK_TYPE_HBOX, + period_select_type = g_type_register_static(GTK_TYPE_BOX, "GncPeriodSelect", &period_select_info, 0); } @@ -613,6 +613,8 @@ gnc_period_select_init (GncPeriodSelect *period) { GncPeriodSelectPrivate *priv; + gtk_orientable_set_orientation (GTK_ORIENTABLE(period), GTK_ORIENTATION_HORIZONTAL); + priv = GNC_PERIOD_SELECT_GET_PRIVATE(period); priv->start = TRUE; } diff --git a/src/gnome-utils/gnc-period-select.h b/src/gnome-utils/gnc-period-select.h index 2245c8686b..f96964dfa7 100644 --- a/src/gnome-utils/gnc-period-select.h +++ b/src/gnome-utils/gnc-period-select.h @@ -44,12 +44,12 @@ G_BEGIN_DECLS /* typedefs & structures */ typedef struct { - GtkHBox hbox; + GtkBox hbox; } GncPeriodSelect; typedef struct { - GtkHBoxClass hbox; + GtkBoxClass hbox; /* Signals */ void (*changed) (GncPeriodSelect *period); diff --git a/src/gnome-utils/gnc-recurrence.c b/src/gnome-utils/gnc-recurrence.c index c19eb93045..66eb22edc1 100644 --- a/src/gnome-utils/gnc-recurrence.c +++ b/src/gnome-utils/gnc-recurrence.c @@ -181,7 +181,7 @@ static void gnc_recurrence_init( GncRecurrence *gr ) { GtkBox *vb; - GtkHBox *hb; + GtkBox *hb; GtkWidget *w; GtkBuilder *builder; @@ -194,7 +194,7 @@ gnc_recurrence_init( GncRecurrence *gr ) gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "RecurrenceEntryVBox"); vb = GTK_BOX(gtk_builder_get_object (builder, "RecurrenceEntryVBox")); - hb = GTK_HBOX(gtk_builder_get_object (builder, "Startdate_hbox")); + hb = GTK_BOX(gtk_builder_get_object (builder, "Startdate_hbox")); w = gnc_date_edit_new (gnc_time (NULL), FALSE, FALSE); gr->gde_start = w; gtk_box_pack_start (GTK_BOX (hb), w, TRUE, TRUE, 0); @@ -405,7 +405,7 @@ struct _GncRecurrenceComp GtkScrolledWindow widget; GtkWidget *vbox; - GtkHBox *hbox; + GtkWidget *hbox; GtkHButtonBox *hbb; gint num_rec; GtkButton *buttRemove; diff --git a/src/gnome-utils/gnc-splash.c b/src/gnome-utils/gnc-splash.c index 9c932345c6..d46e1a75de 100644 --- a/src/gnome-utils/gnc-splash.c +++ b/src/gnome-utils/gnc-splash.c @@ -87,7 +87,8 @@ gnc_show_splash_screen (void) frame = gtk_frame_new (NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); #ifdef GNUCASH_SCM /* Development version */ /* Translators: 1st %s is the GnuCash version (eg 2.4.11); diff --git a/src/gnome-utils/window-main-summarybar.c b/src/gnome-utils/window-main-summarybar.c index bdf9a34446..e8a27a343e 100644 --- a/src/gnome-utils/window-main-summarybar.c +++ b/src/gnome-utils/window-main-summarybar.c @@ -530,7 +530,9 @@ gnc_main_window_summary_new (void) G_TYPE_STRING, G_TYPE_STRING); - retval->hbox = gtk_hbox_new (FALSE, 5); + retval->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (retval->hbox), FALSE); + retval->totals_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (retval->datamodel)); g_object_unref (retval->datamodel); diff --git a/src/gnome/assistant-loan.c b/src/gnome/assistant-loan.c index 53492dcd09..a9dea6f436 100644 --- a/src/gnome/assistant-loan.c +++ b/src/gnome/assistant-loan.c @@ -244,7 +244,7 @@ typedef struct LoanAssistantData_ /* opt = options */ GtkBox *optVBox; GtkCheckButton *optEscrowCb; - GtkHBox *optEscrowHBox; + GtkBox *optEscrowHBox; GNCAccountSel *optEscrowGAS; /* rep = repayment */ @@ -501,7 +501,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd ) { ldd->optVBox = GTK_BOX(gtk_builder_get_object(builder, "loan_options_page")); ldd->optEscrowCb = GTK_CHECK_BUTTON(gtk_builder_get_object(builder, "opt_escrow_cb")); - ldd->optEscrowHBox = GTK_HBOX(gtk_builder_get_object(builder, "opt_escrow_hbox")); + ldd->optEscrowHBox = GTK_BOX(gtk_builder_get_object(builder, "opt_escrow_hbox")); } /* Payment Page */ { @@ -797,16 +797,16 @@ gnc_loan_assistant_create( LoanAssistantData *ldd ) G_CALLBACK(loan_pay_freq_toggle_cb), ldd ); { - GtkHBox *hbox; - hbox = GTK_HBOX(gtk_builder_get_object(builder, "type_freq_hbox")); + GtkBox *hbox; + hbox = GTK_BOX(gtk_builder_get_object(builder, "type_freq_hbox")); ldd->prmVarGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL )); gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->prmVarGncFreq), TRUE, FALSE, 0 ); g_signal_connect (ldd->prmVarGncFreq, "changed", G_CALLBACK (loan_info_page_valid_cb), ldd); } { - GtkHBox *hbox; - hbox = GTK_HBOX(gtk_builder_get_object(builder, "freq_frame_hbox")); + GtkBox *hbox; + hbox = GTK_BOX(gtk_builder_get_object(builder, "freq_frame_hbox")); ldd->repGncFreq = GNC_FREQUENCY(gnc_frequency_new( NULL, NULL )); gtk_box_pack_start( GTK_BOX(hbox) , GTK_WIDGET(ldd->repGncFreq), TRUE, FALSE, 0 ); g_signal_connect (ldd->repGncFreq, "changed", diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index e15f086a79..43104f5473 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -1986,7 +1986,8 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) GtkWidget *hbox; GtkWidget *label; - hbox = gtk_hbox_new(FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start( GTK_BOX(summarybar), hbox, FALSE, FALSE, 5 ); label = gtk_label_new( label_str ); @@ -2019,7 +2020,8 @@ gsr_create_summary_bar( GNCSplitReg *gsr ) return NULL; } - summarybar = gtk_hbox_new (FALSE, 4); + summarybar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + gtk_box_set_homogeneous (GTK_BOX (summarybar), FALSE); if (!xaccAccountIsPriced(gnc_ledger_display_leader(gsr->ledger))) { diff --git a/src/gnome/gnc-split-reg2.c b/src/gnome/gnc-split-reg2.c index 38157cea4d..04264f3a69 100644 --- a/src/gnome/gnc-split-reg2.c +++ b/src/gnome/gnc-split-reg2.c @@ -279,7 +279,8 @@ gsr2_create_table (GNCSplitReg2 *gsr) "show-column-menu", FALSE, NULL); // Create a hbox for treeview and scrollbar. - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_widget_show (hbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); @@ -769,7 +770,8 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) GtkWidget *hbox; GtkWidget *label; - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start (GTK_BOX (summarybar), hbox, FALSE, FALSE, 5); label = gtk_label_new (label_str); @@ -802,7 +804,8 @@ gnc_split_reg2_create_summary_bar (GNCSplitReg2 *gsr) return NULL; } - summarybar = gtk_hbox_new (FALSE, 4); + summarybar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + gtk_box_set_homogeneous (GTK_BOX (summarybar), FALSE); if (!xaccAccountIsPriced(gnc_ledger_display2_leader(gsr->ledger))) { diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 29e988a3c2..9afb3e7d79 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1175,7 +1175,8 @@ gnc_reconcile_window_create_view_box(Account *account, gtk_container_add(GTK_CONTAINER(scrollWin), view); gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new(_("Total:")); @@ -1820,7 +1821,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, GtkWidget *totals_hbox, *frame, *title, *value; /* lower horizontal bar below reconcile lists */ - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start(GTK_BOX(main_area), hbox, FALSE, FALSE, 0); /* frame to hold totals */ @@ -1828,7 +1830,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gtk_box_pack_end(GTK_BOX(hbox), frame, FALSE, FALSE, 0); /* hbox to hold title/value vboxes */ - totals_hbox = gtk_hbox_new(FALSE, 3); + totals_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (totals_hbox), FALSE); gtk_container_add(GTK_CONTAINER(frame), totals_hbox); gtk_container_set_border_width(GTK_CONTAINER(totals_hbox), 5); diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index 6188ad9360..7b42f5b8cc 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -1138,7 +1138,8 @@ gnc_reconcile_window_create_view_box (Account *account, gtk_container_add (GTK_CONTAINER (scrollWin), view); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); - hbox = gtk_hbox_new (FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new (_("Total:")); @@ -1780,7 +1781,8 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, GtkWidget *totals_hbox, *frame, *title, *value; /* lower horizontal bar below reconcile lists */ - hbox = gtk_hbox_new (FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); + gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE); gtk_box_pack_start (GTK_BOX (main_area), hbox, FALSE, FALSE, 0); /* frame to hold totals */ @@ -1788,7 +1790,8 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0); /* hbox to hold title/value vboxes */ - totals_hbox = gtk_hbox_new (FALSE, 3); + totals_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + gtk_box_set_homogeneous (GTK_BOX (totals_hbox), FALSE); gtk_container_add (GTK_CONTAINER (frame), totals_hbox); gtk_container_set_border_width (GTK_CONTAINER (totals_hbox), 5); diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c index e9a8c6c988..89f07a61e8 100644 --- a/src/import-export/csv-exp/assistant-csv-export.c +++ b/src/import-export/csv-exp/assistant-csv-export.c @@ -921,7 +921,8 @@ csv_export_assistant_create (CsvExportInfo *info) button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); - h_box = gtk_hbox_new (TRUE, 0); + h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (h_box), TRUE); gtk_box_pack_start(GTK_BOX(h_box), button, FALSE, FALSE, 0); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), h_box); g_signal_connect (G_OBJECT(button), "clicked", diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c index d14571be0f..0a0ee464bc 100644 --- a/src/import-export/csv-imp/assistant-csv-account-import.c +++ b/src/import-export/csv-imp/assistant-csv-account-import.c @@ -610,7 +610,8 @@ csv_import_assistant_create (CsvImportInfo *info) button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); - h_box = gtk_hbox_new (TRUE, 0); + h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (h_box), TRUE); gtk_box_pack_start (GTK_BOX(h_box), button, FALSE, FALSE, 0); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(info->file_chooser), h_box); g_signal_connect (G_OBJECT(button), "clicked", diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.cpp b/src/import-export/csv-imp/assistant-csv-trans-import.cpp index ce4ff79e0a..eb5adc63b6 100644 --- a/src/import-export/csv-imp/assistant-csv-trans-import.cpp +++ b/src/import-export/csv-imp/assistant-csv-trans-import.cpp @@ -423,7 +423,9 @@ CsvImpTransAssist::CsvImpTransAssist () auto button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); - auto h_box = gtk_hbox_new (TRUE, 0); + auto h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (h_box), TRUE); + gtk_box_pack_start (GTK_BOX(h_box), button, FALSE, FALSE, 0); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(file_chooser), h_box); g_signal_connect (G_OBJECT(button), "clicked", diff --git a/src/import-export/import-account-matcher.c b/src/import-export/import-account-matcher.c index fe17bd9bd8..75458bd7b6 100644 --- a/src/import-export/import-account-matcher.c +++ b/src/import-export/import-account-matcher.c @@ -443,7 +443,10 @@ AccountPickerDialog* gnc_import_account_assist_setup(GtkWidget *parent) /* Add the New Account Button */ picker->new_button = gtk_button_new_with_mnemonic ("_New Account"); - h_box = gtk_hbox_new(TRUE, 0); + + h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_set_homogeneous (GTK_BOX (h_box), TRUE); + gtk_box_pack_start(GTK_BOX(h_box), picker->new_button, FALSE, FALSE, 0); gtk_box_pack_start( GTK_BOX(box), h_box, FALSE, FALSE, 6); gtk_button_set_use_stock (GTK_BUTTON(picker->new_button), TRUE);