From 5c2a70bcabca9c259df2fab691748119973b2562 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 16 Jun 2017 11:33:41 +0100 Subject: [PATCH] Change all the GtkVBox widgets Change all GtkVBox widgets to GtkBox with orientation VERTICAL --- .../business-gnome/gnc-plugin-page-invoice.c | 4 ++- .../gnc-plugin-page-owner-tree.c | 3 +- src/gnome-search/dialog-search.c | 3 +- src/gnome-utils/assistant-xml-encoding.c | 4 ++- src/gnome-utils/dialog-account.c | 3 +- src/gnome-utils/dialog-options.c | 30 ++++++++++++++----- src/gnome-utils/dialog-query-view.c | 4 ++- src/gnome-utils/gnc-cell-renderer-date.c | 4 ++- src/gnome-utils/gnc-embedded-window.c | 7 +++-- src/gnome-utils/gnc-embedded-window.h | 4 +-- src/gnome-utils/gnc-frequency.c | 8 +++-- src/gnome-utils/gnc-frequency.h | 6 ++-- src/gnome-utils/gnc-gui-query.c | 6 ++-- src/gnome-utils/gnc-recurrence.c | 20 ++++++++----- src/gnome-utils/gnc-splash.c | 3 +- src/gnome-utils/gnc-window.h | 2 +- src/gnome/assistant-hierarchy.c | 3 +- src/gnome/assistant-loan.c | 9 +++--- src/gnome/gnc-budget-view.c | 13 ++++---- src/gnome/gnc-plugin-page-account-tree.c | 3 +- src/gnome/gnc-plugin-page-register.c | 3 +- src/gnome/gnc-plugin-page-register2.c | 3 +- src/gnome/gnc-plugin-page-sx-list.c | 6 ++-- src/gnome/gnc-split-reg.c | 4 ++- src/gnome/gnc-split-reg.h | 4 +-- src/gnome/gnc-split-reg2.c | 4 ++- src/gnome/gnc-split-reg2.h | 4 +-- src/gnome/window-reconcile.c | 20 ++++++++----- src/gnome/window-reconcile2.c | 20 ++++++++----- src/import-export/aqb/gnc-gwen-gui.c | 10 +++++-- .../qif-imp/assistant-qif-import.c | 3 +- 31 files changed, 145 insertions(+), 75 deletions(-) diff --git a/src/business/business-gnome/gnc-plugin-page-invoice.c b/src/business/business-gnome/gnc-plugin-page-invoice.c index ee2d5bcb30..121a8b173c 100644 --- a/src/business/business-gnome/gnc-plugin-page-invoice.c +++ b/src/business/business-gnome/gnc-plugin-page-invoice.c @@ -460,7 +460,9 @@ gnc_plugin_page_invoice_create_widget (GncPluginPage *plugin_page) return priv->widget; } - priv->widget = gtk_vbox_new (FALSE, 0); + priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE); + gtk_widget_show (priv->widget); widget = gnc_invoice_create_page(priv->iw, page); diff --git a/src/business/business-gnome/gnc-plugin-page-owner-tree.c b/src/business/business-gnome/gnc-plugin-page-owner-tree.c index 66191dadcf..73757e0476 100644 --- a/src/business/business-gnome/gnc-plugin-page-owner-tree.c +++ b/src/business/business-gnome/gnc-plugin-page-owner-tree.c @@ -570,7 +570,8 @@ gnc_plugin_page_owner_tree_create_widget (GncPluginPage *plugin_page) return priv->widget; } - priv->widget = gtk_vbox_new (FALSE, 0); + priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE); gtk_widget_show (priv->widget); scrolled_window = gtk_scrolled_window_new (NULL, NULL); diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index b48e47796d..1f1e2776f2 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -341,7 +341,8 @@ gnc_search_dialog_display_results (GNCSearchWindow *sw) gtk_container_add(GTK_CONTAINER(frame), scroller); /* Create the button_box */ - button_box = gtk_vbox_new (FALSE, 3); + button_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (button_box), FALSE); /* ... and add all the buttons */ if (sw->buttons) diff --git a/src/gnome-utils/assistant-xml-encoding.c b/src/gnome-utils/assistant-xml-encoding.c index 5ade66c737..0b3238b90b 100644 --- a/src/gnome-utils/assistant-xml-encoding.c +++ b/src/gnome-utils/assistant-xml-encoding.c @@ -738,7 +738,9 @@ gxi_update_string_box (GncXmlImportData *data) if (data->string_box) gtk_widget_destroy (data->string_box); - data->string_box = gtk_vbox_new (FALSE, 6); + data->string_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_box_set_homogeneous (GTK_BOX (data->string_box), FALSE); + vbox = GTK_BOX (data->string_box); data->n_unassigned = 0; diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 975cacf935..79cbccc1ac 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -650,7 +650,8 @@ verify_children_compatible (AccountWindow *aw) gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE); hbox = gtk_hbox_new (FALSE, 12); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_box_pack_start ( GTK_BOX (hbox), diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c index 2d81074a1b..1213197f84 100644 --- a/src/gnome-utils/dialog-options.c +++ b/src/gnome-utils/dialog-options.c @@ -866,7 +866,9 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option) frame = gtk_frame_new (name); /* Create the verticle button box */ - vbox1 = gtk_vbox_new (FALSE, 5); + vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox1), FALSE); + gtk_container_add (GTK_CONTAINER (frame), vbox1); /* Iterate over the three options and create a radio button for each one */ @@ -890,7 +892,10 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option) /* 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); - vbox2 = gtk_vbox_new(FALSE, 5); + + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0); if (i == 1) /* book-currency */ @@ -910,7 +915,9 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option) "changed", G_CALLBACK(gnc_option_changed_widget_cb), option); - vbox2 = gtk_vbox_new(FALSE, 5); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE); + gtk_widget_set_tooltip_text(vbox2, tip && *tip ? _(tip) : ""); gtk_box_pack_start (GTK_BOX (vbox2), widget_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), @@ -923,7 +930,10 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option) } tip = gnc_currency_accounting_option_policy_documentation(option); widget_label = gtk_label_new( _("Default Gains Policy") ); - vbox2 = gtk_vbox_new(FALSE, 5); + + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE); + gtk_widget_set_tooltip_text(vbox2, tip && *tip ? _(tip) : ""); gtk_box_pack_start (GTK_BOX (vbox2), widget_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), @@ -1019,7 +1029,9 @@ gnc_option_create_account_widget(GNCOption *option, char *name) frame = gtk_frame_new(name); - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); + gtk_container_add(GTK_CONTAINER(frame), vbox); tree = GTK_WIDGET(gnc_tree_view_account_new (FALSE)); @@ -1369,14 +1381,18 @@ gnc_options_dialog_append_page(GNCOptionWin * propertybox, gtk_widget_show(page_label); /* Build this options page */ - page_content_box = gtk_vbox_new(FALSE, 2); + page_content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + gtk_box_set_homogeneous (GTK_BOX (page_content_box), FALSE); + gtk_container_set_border_width(GTK_CONTAINER(page_content_box), 12); options_scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(page_content_box), options_scrolled_win, TRUE, TRUE, 0); /* Build space for the content - the options box */ - options_box = gtk_vbox_new(FALSE, 5); + options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (options_box), FALSE); + gtk_container_set_border_width(GTK_CONTAINER(options_box), 0); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(options_scrolled_win), options_box); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(options_scrolled_win), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/src/gnome-utils/dialog-query-view.c b/src/gnome-utils/dialog-query-view.c index d9b73e83e1..5a345f7190 100644 --- a/src/gnome-utils/dialog-query-view.c +++ b/src/gnome-utils/dialog-query-view.c @@ -214,7 +214,9 @@ gnc_dialog_query_view_new (GList *param_list, Query *q) gtk_box_pack_start (GTK_BOX (result_hbox), frame, TRUE, TRUE, 3); /* Create the button_box */ - dqv->button_box = gtk_vbox_new (FALSE, 2); + dqv->button_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + gtk_box_set_homogeneous (GTK_BOX (dqv->button_box), FALSE); + gtk_box_pack_start (GTK_BOX (result_hbox), dqv->button_box, FALSE, FALSE, 3); /* connect the double-click signal of the qview */ diff --git a/src/gnome-utils/gnc-cell-renderer-date.c b/src/gnome-utils/gnc-cell-renderer-date.c index bb13c7fb82..5810b77705 100644 --- a/src/gnome-utils/gnc-cell-renderer-date.c +++ b/src/gnome-utils/gnc-cell-renderer-date.c @@ -143,7 +143,9 @@ gcrd_init (GncCellRendererDate *date) gtk_container_add (GTK_CONTAINER (popup->popup_window), frame); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); + gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); diff --git a/src/gnome-utils/gnc-embedded-window.c b/src/gnome-utils/gnc-embedded-window.c index 82598de6df..50b20783db 100644 --- a/src/gnome-utils/gnc-embedded-window.c +++ b/src/gnome-utils/gnc-embedded-window.c @@ -119,7 +119,7 @@ gnc_embedded_window_get_type (void) NULL }; - gnc_embedded_window_type = g_type_register_static (GTK_TYPE_VBOX, + gnc_embedded_window_type = g_type_register_static (GTK_TYPE_BOX, "GncEmbeddedWindow", &our_info, 0); g_type_add_interface_static (gnc_embedded_window_type, @@ -237,6 +237,8 @@ gnc_embedded_window_init (GncEmbeddedWindow *window, { ENTER("window %p", window); + gtk_orientable_set_orientation (GTK_ORIENTABLE(window), GTK_ORIENTATION_VERTICAL); + gnc_embedded_window_setup_window (window); gnc_gobject_tracking_remember(G_OBJECT(window), @@ -324,7 +326,8 @@ gnc_embedded_window_setup_window (GncEmbeddedWindow *window) /* Create widgets and add them to the window */ gtk_widget_show (GTK_WIDGET(window)); - priv->menu_dock = gtk_vbox_new (FALSE, 0); + priv->menu_dock = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->menu_dock), FALSE); gtk_widget_show (priv->menu_dock); gtk_box_pack_start (GTK_BOX (window), priv->menu_dock, FALSE, TRUE, 0); diff --git a/src/gnome-utils/gnc-embedded-window.h b/src/gnome-utils/gnc-embedded-window.h index 0a497a0f89..081f6a546d 100644 --- a/src/gnome-utils/gnc-embedded-window.h +++ b/src/gnome-utils/gnc-embedded-window.h @@ -56,7 +56,7 @@ G_BEGIN_DECLS typedef struct { /** The parent object for an embedded window. */ - GtkVBox vbox; + GtkBox vbox; /** A pointer to the UI Manager data structure for the whole * window. */ GtkUIManager *ui_merge; @@ -67,7 +67,7 @@ typedef struct typedef struct { /** The parent class for an embedded window. */ - GtkVBoxClass vbox; + GtkBoxClass vbox; } GncEmbeddedWindowClass; diff --git a/src/gnome-utils/gnc-frequency.c b/src/gnome-utils/gnc-frequency.c index bba0c74a7e..22ef9ac75f 100644 --- a/src/gnome-utils/gnc-frequency.c +++ b/src/gnome-utils/gnc-frequency.c @@ -127,7 +127,7 @@ gnc_frequency_get_type() (GInstanceInitFunc)gnc_frequency_init }; - gncfreq_type = g_type_register_static (GTK_TYPE_VBOX, + gncfreq_type = g_type_register_static (GTK_TYPE_BOX, "GncFrequency", &gncfreq_info, 0); } @@ -167,7 +167,7 @@ void gnc_frequency_init(GncFrequency *gf) { int i; - GtkVBox* vb; + GtkBox* vb; GtkWidget* o; GtkAdjustment* adj; GtkBuilder *builder; @@ -201,6 +201,8 @@ gnc_frequency_init(GncFrequency *gf) { NULL, NULL } }; + gtk_orientable_set_orientation (GTK_ORIENTABLE(gf), GTK_ORIENTATION_VERTICAL); + builder = gtk_builder_new(); gnc_builder_add_from_file (builder , "gnc-frequency.glade", "adjustment1"); gnc_builder_add_from_file (builder , "gnc-frequency.glade", "adjustment2"); @@ -229,7 +231,7 @@ gnc_frequency_init(GncFrequency *gf) 4, 5, 0, 1, dont_expand_or_fill, 0, 0, 0); } - vb = GTK_VBOX(gtk_builder_get_object (builder, "gncfreq_vbox")); + vb = GTK_BOX(gtk_builder_get_object (builder, "gncfreq_vbox")); gf->vb = vb; gtk_container_add(GTK_CONTAINER(&gf->widget), GTK_WIDGET(gf->vb)); diff --git a/src/gnome-utils/gnc-frequency.h b/src/gnome-utils/gnc-frequency.h index a2eef6adc9..cda847075f 100644 --- a/src/gnome-utils/gnc-frequency.h +++ b/src/gnome-utils/gnc-frequency.h @@ -42,8 +42,8 @@ **/ typedef struct _GncFrequency { - GtkVBox widget; - GtkVBox *vb; + GtkBox widget; + GtkBox *vb; GtkNotebook *nb; GtkComboBox *freqComboBox; GNCDateEdit *startDate; @@ -52,7 +52,7 @@ typedef struct _GncFrequency typedef struct _GncFrequencyClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; void (*changed) (GncFrequency *gf); } GncFrequencyClass; diff --git a/src/gnome-utils/gnc-gui-query.c b/src/gnome-utils/gnc-gui-query.c index 8a9e6b73dd..6f7aa690c8 100644 --- a/src/gnome-utils/gnc-gui-query.c +++ b/src/gnome-utils/gnc-gui-query.c @@ -301,7 +301,8 @@ gnc_choose_radio_option_dialog(GtkWidget *parent, GList *node; int i; - main_vbox = gtk_vbox_new(FALSE, 3); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (main_vbox), FALSE); gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 6); gtk_widget_show(main_vbox); @@ -315,7 +316,8 @@ gnc_choose_radio_option_dialog(GtkWidget *parent, gtk_box_pack_start(GTK_BOX(main_vbox), alignment, FALSE, FALSE, 0); gtk_widget_show(alignment); - vbox = gtk_vbox_new(TRUE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); gtk_container_add(GTK_CONTAINER(alignment), vbox); gtk_widget_show(vbox); diff --git a/src/gnome-utils/gnc-recurrence.c b/src/gnome-utils/gnc-recurrence.c index f9043335f6..c19eb93045 100644 --- a/src/gnome-utils/gnc-recurrence.c +++ b/src/gnome-utils/gnc-recurrence.c @@ -37,7 +37,7 @@ static QofLogModule log_module = GNC_MOD_GUI; struct _GncRecurrence { - GtkVBox widget; + GtkBox widget; GtkWidget *gde_start; GtkComboBox *gcb_period; @@ -50,7 +50,7 @@ struct _GncRecurrence typedef struct { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; void (*changed) (GncRecurrence *gr); } GncRecurrenceClass; @@ -180,7 +180,7 @@ something_changed( GtkWidget *wid, gpointer d ) static void gnc_recurrence_init( GncRecurrence *gr ) { - GtkVBox *vb; + GtkBox *vb; GtkHBox *hb; GtkWidget *w; GtkBuilder *builder; @@ -193,7 +193,7 @@ gnc_recurrence_init( GncRecurrence *gr ) gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "GSB_Mult_Adj"); gnc_builder_add_from_file (builder, "gnc-recurrence.glade", "RecurrenceEntryVBox"); - vb = GTK_VBOX(gtk_builder_get_object (builder, "RecurrenceEntryVBox")); + vb = GTK_BOX(gtk_builder_get_object (builder, "RecurrenceEntryVBox")); hb = GTK_HBOX(gtk_builder_get_object (builder, "Startdate_hbox")); w = gnc_date_edit_new (gnc_time (NULL), FALSE, FALSE); gr->gde_start = w; @@ -378,7 +378,7 @@ gnc_recurrence_get_type() (GInstanceInitFunc)gnc_recurrence_init }; - type = g_type_register_static (GTK_TYPE_VBOX, "GncRecurrence", + type = g_type_register_static (GTK_TYPE_BOX, "GncRecurrence", &typeinfo, 0); } return type; @@ -404,7 +404,7 @@ struct _GncRecurrenceComp { GtkScrolledWindow widget; - GtkVBox *vbox; + GtkWidget *vbox; GtkHBox *hbox; GtkHButtonBox *hbb; gint num_rec; @@ -534,8 +534,11 @@ gnc_recurrence_comp_init(GncRecurrenceComp *grc) { GtkWidget *vb; + gtk_orientable_set_orientation (GTK_ORIENTABLE(grc), GTK_ORIENTATION_VERTICAL); + grc->hbb = GTK_HBUTTON_BOX(gtk_hbutton_box_new()); - grc->vbox = GTK_VBOX(gtk_vbox_new(FALSE, 1)); + grc->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1); + gtk_box_set_homogeneous (GTK_BOX (grc->vbox), FALSE); grc->rlist = NULL; grc->buttAdd = GTK_BUTTON(gtk_button_new_from_stock(GTK_STOCK_ADD)); @@ -550,7 +553,8 @@ gnc_recurrence_comp_init(GncRecurrenceComp *grc) gtk_box_pack_start(GTK_BOX(grc->hbb), GTK_WIDGET(grc->buttRemove), FALSE, FALSE, 3); - vb = gtk_vbox_new(FALSE, 1); + vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1); + gtk_box_set_homogeneous (GTK_BOX (vb), FALSE); gtk_box_pack_start(GTK_BOX(vb), GTK_WIDGET(grc->hbb), FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(vb), GTK_WIDGET(grc->vbox), diff --git a/src/gnome-utils/gnc-splash.c b/src/gnome-utils/gnc-splash.c index a664a33522..9c932345c6 100644 --- a/src/gnome-utils/gnc-splash.c +++ b/src/gnome-utils/gnc-splash.c @@ -85,7 +85,8 @@ gnc_show_splash_screen (void) } frame = gtk_frame_new (NULL); - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); hbox = gtk_hbox_new (FALSE, 3); #ifdef GNUCASH_SCM /* Development version */ diff --git a/src/gnome-utils/gnc-window.h b/src/gnome-utils/gnc-window.h index 31731427df..fa9b23a225 100644 --- a/src/gnome-utils/gnc-window.h +++ b/src/gnome-utils/gnc-window.h @@ -34,7 +34,7 @@ GnuCash has two types of "windows" that can show Plugin Pages. The first is called a "Main Window" and is implemented on top of a GtkWindow. The second is called an "Embedded Window" and is - implemented on top of a GtkVBox. The functions in this file will + implemented on top of a GtkBox. The functions in this file will work with either type of window. */ diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index f306c521f4..55a697f4c1 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -1141,7 +1141,8 @@ book_options_dialog_close_cb(GNCOptionWin * optionwin, static void assistant_instert_book_options_page (hierarchy_data *data) { - GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); data->options = gnc_option_db_new_for_type (QOF_ID_BOOK); qof_book_load_options (gnc_get_current_book (), diff --git a/src/gnome/assistant-loan.c b/src/gnome/assistant-loan.c index 812f985ee1..53492dcd09 100644 --- a/src/gnome/assistant-loan.c +++ b/src/gnome/assistant-loan.c @@ -242,7 +242,7 @@ typedef struct LoanAssistantData_ GtkComboBox *prmIrateType; /* opt = options */ - GtkVBox *optVBox; + GtkBox *optVBox; GtkCheckButton *optEscrowCb; GtkHBox *optEscrowHBox; GNCAccountSel *optEscrowGAS; @@ -499,7 +499,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd ) } /* Options Page */ { - ldd->optVBox = GTK_VBOX(gtk_builder_get_object(builder, "loan_options_page")); + 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")); } @@ -728,7 +728,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd ) */ RepayOptUIData *rouid; - GtkVBox *vb; + GtkWidget *vb; GtkAlignment *optAlign, *subOptAlign; GString *str; @@ -737,7 +737,8 @@ gnc_loan_assistant_create( LoanAssistantData *ldd ) for ( i = 0; i < ldd->ld.repayOptCount; i++ ) { rouid = ldd->repayOptsUI[i]; - vb = GTK_VBOX(gtk_vbox_new( FALSE, 2 )); + vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); + gtk_box_set_homogeneous (GTK_BOX (vb), FALSE); /* Add payment checkbox. */ diff --git a/src/gnome/gnc-budget-view.c b/src/gnome/gnc-budget-view.c index 5cd197e837..772cd33233 100644 --- a/src/gnome/gnc-budget-view.c +++ b/src/gnome/gnc-budget-view.c @@ -79,12 +79,12 @@ typedef struct GncBudgetViewPrivate GncBudgetViewPrivate; struct _GncBudgetView { - GtkVBox w; + GtkBox w; }; struct _GncBudgetViewClass { - GtkVBoxClass w; + GtkBoxClass w; }; enum @@ -160,7 +160,7 @@ struct GncBudgetViewPrivate #define GNC_BUDGET_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_BUDGET_VIEW, GncBudgetViewPrivate)) -G_DEFINE_TYPE(GncBudgetView, gnc_budget_view, GTK_TYPE_VBOX) +G_DEFINE_TYPE(GncBudgetView, gnc_budget_view, GTK_TYPE_BOX) /** \brief Create new gnc budget view. @@ -316,7 +316,7 @@ gbv_create_widget(GncBudgetView *view) GtkTreeView *tree_view; GtkWidget *scrolled_window; GtkWidget *inner_scrolled_window; - GtkVBox* vbox; + GtkBox* vbox; GtkWidget* inner_vbox; GtkListStore* totals_tree_model; GtkTreeView* totals_tree_view; @@ -327,7 +327,7 @@ gbv_create_widget(GncBudgetView *view) gchar guidstr[GUID_ENCODING_LENGTH+1]; priv = GNC_BUDGET_VIEW_GET_PRIVATE(view); - vbox = GTK_VBOX(view); + vbox = GTK_BOX(view); gtk_widget_show(GTK_WIDGET(vbox)); gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE); @@ -339,7 +339,8 @@ gbv_create_widget(GncBudgetView *view) gtk_widget_show(scrolled_window); gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, /*expand*/TRUE, /*fill*/TRUE, 0); - inner_vbox = gtk_vbox_new(FALSE, 0); + inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (inner_vbox), FALSE); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), GTK_WIDGET(inner_vbox)); gtk_widget_show(GTK_WIDGET(inner_vbox)); diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c index be8743366e..35bf0c5083 100644 --- a/src/gnome/gnc-plugin-page-account-tree.c +++ b/src/gnome/gnc-plugin-page-account-tree.c @@ -632,7 +632,8 @@ gnc_plugin_page_account_tree_create_widget (GncPluginPage *plugin_page) return priv->widget; } - priv->widget = gtk_vbox_new (FALSE, 0); + priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE); gtk_widget_show (priv->widget); scrolled_window = gtk_scrolled_window_new (NULL, NULL); diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index 2f8290b4e3..fb84fb9bd8 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -1081,7 +1081,8 @@ gnc_plugin_page_register_create_widget (GncPluginPage *plugin_page) return priv->widget; } - priv->widget = gtk_vbox_new (FALSE, 0); + priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE); gtk_widget_show (priv->widget); numRows = priv->lines_default; diff --git a/src/gnome/gnc-plugin-page-register2.c b/src/gnome/gnc-plugin-page-register2.c index 53df9890be..8e0de48182 100644 --- a/src/gnome/gnc-plugin-page-register2.c +++ b/src/gnome/gnc-plugin-page-register2.c @@ -1091,7 +1091,8 @@ gnc_plugin_page_register2_create_widget (GncPluginPage *plugin_page) return priv->widget; } - priv->widget = gtk_vbox_new (FALSE, 0); + priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE); gtk_widget_show (priv->widget); numRows = priv->lines_default; diff --git a/src/gnome/gnc-plugin-page-sx-list.c b/src/gnome/gnc-plugin-page-sx-list.c index c97da4430e..a2995960cc 100644 --- a/src/gnome/gnc-plugin-page-sx-list.c +++ b/src/gnome/gnc-plugin-page-sx-list.c @@ -372,7 +372,8 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page) gtk_widget_show (priv->widget); /* Add vbox and label */ - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_paned_pack1( GTK_PANED(widget), vbox, TRUE, FALSE); label = gtk_label_new(NULL); @@ -434,7 +435,8 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page) } /* Add vbox and label */ - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);; gtk_paned_pack2( GTK_PANED(widget), vbox, TRUE, FALSE); label = gtk_label_new(NULL); diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index 77a72228eb..e15f086a79 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -191,7 +191,7 @@ gnc_split_reg_get_type( void ) (GInstanceInitFunc)gnc_split_reg_init, }; - gnc_split_reg_type = g_type_register_static( GTK_TYPE_VBOX, + gnc_split_reg_type = g_type_register_static( GTK_TYPE_BOX, "GNCSplitReg", &type_info, 0 ); } @@ -340,6 +340,8 @@ gnc_split_reg_new( GNCLedgerDisplay *ld, static void gnc_split_reg_init( GNCSplitReg *gsr ) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gsr), GTK_ORIENTATION_VERTICAL); + gsr->sort_type = BY_STANDARD; gsr->width = -1; gsr->height = -1; diff --git a/src/gnome/gnc-split-reg.h b/src/gnome/gnc-split-reg.h index a68f9afbe9..412b0133af 100644 --- a/src/gnome/gnc-split-reg.h +++ b/src/gnome/gnc-split-reg.h @@ -42,7 +42,7 @@ typedef struct _GNCSplitRegClass GNCSplitRegClass; struct _GNCSplitReg { /* The "parent" widget. */ - GtkVBox vbox; + GtkBox vbox; /* The containing window. */ GtkWidget *window; @@ -89,7 +89,7 @@ struct _GNCSplitReg struct _GNCSplitRegClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; /* Signal defaults */ void (*enter_ent_cb) ( GNCSplitReg *w, gpointer user_data ); diff --git a/src/gnome/gnc-split-reg2.c b/src/gnome/gnc-split-reg2.c index 8a7ac808b8..38157cea4d 100644 --- a/src/gnome/gnc-split-reg2.c +++ b/src/gnome/gnc-split-reg2.c @@ -120,7 +120,7 @@ gnc_split_reg2_get_type (void) (GInstanceInitFunc)gnc_split_reg2_init, }; - gnc_split_reg2_type = g_type_register_static (GTK_TYPE_VBOX, + gnc_split_reg2_type = g_type_register_static (GTK_TYPE_BOX, "GNCSplitReg2", &type_info, 0 ); } @@ -186,6 +186,8 @@ gnc_split_reg2_new (GNCLedgerDisplay2 *ld, static void gnc_split_reg2_init (GNCSplitReg2 *gsr) { + gtk_orientable_set_orientation (GTK_ORIENTABLE(gsr), GTK_ORIENTATION_VERTICAL); + gsr->numRows = 10; gsr->read_only = FALSE; diff --git a/src/gnome/gnc-split-reg2.h b/src/gnome/gnc-split-reg2.h index 5e00a2dcdf..02fe57eb22 100644 --- a/src/gnome/gnc-split-reg2.h +++ b/src/gnome/gnc-split-reg2.h @@ -49,7 +49,7 @@ typedef struct _GNCSplitReg2Class GNCSplitReg2Class; struct _GNCSplitReg2 { /* The "parent" widget. */ - GtkVBox vbox; + GtkBox vbox; /* The containing window. */ GtkWidget *window; @@ -78,7 +78,7 @@ struct _GNCSplitReg2 struct _GNCSplitReg2Class { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; /* Signal defaults */ void (*help_changed) (GNCSplitReg2 *w, gpointer user_data); diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 991f417acc..29e988a3c2 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1140,7 +1140,8 @@ gnc_reconcile_window_create_view_box(Account *account, else recnData->credit_frame = frame; - vbox = gtk_vbox_new(FALSE, 5); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); view = gnc_reconcile_view_new(account, type, recnData->statement_date); *list_save = view; @@ -1656,7 +1657,7 @@ recnWindow (GtkWidget *parent, Account *account) static void recnWindow_add_widget (GtkUIManager *merge, GtkWidget *widget, - GtkVBox *dock) + GtkBox *dock) { gtk_box_pack_start (GTK_BOX (dock), widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -1713,10 +1714,12 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_recn_set_window_name(recnData); - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_container_add(GTK_CONTAINER(recnData->window), vbox); - dock = gtk_vbox_new (FALSE, 0); + dock = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (dock), FALSE); gtk_widget_show(dock); gtk_box_pack_start(GTK_BOX (vbox), dock, FALSE, TRUE, 0); @@ -1781,11 +1784,12 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, /* The main area */ { GtkWidget *frame = gtk_frame_new(NULL); - GtkWidget *main_area = gtk_vbox_new(FALSE, 10); + GtkWidget *main_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); GtkWidget *debcred_area = gtk_table_new(1, 2, TRUE); GtkWidget *debits_box; GtkWidget *credits_box; + gtk_box_set_homogeneous (GTK_BOX (main_area), FALSE); gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 10); /* Force a reasonable starting size */ @@ -1829,11 +1833,13 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gtk_container_set_border_width(GTK_CONTAINER(totals_hbox), 5); /* vbox to hold titles */ - title_vbox = gtk_vbox_new(FALSE, 3); + title_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (title_vbox), FALSE); gtk_box_pack_start(GTK_BOX(totals_hbox), title_vbox, FALSE, FALSE, 0); /* vbox to hold values */ - value_vbox = gtk_vbox_new(FALSE, 3); + value_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (value_vbox), FALSE); gtk_box_pack_start(GTK_BOX(totals_hbox), value_vbox, TRUE, TRUE, 0); /* statement date title/value */ diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index 783aac6237..6188ad9360 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -1103,7 +1103,8 @@ gnc_reconcile_window_create_view_box (Account *account, else recnData->credit_frame = frame; - vbox = gtk_vbox_new (FALSE, 5); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); view = gnc_reconcile_view_new(account, type, recnData->statement_date); *list_save = view; @@ -1616,7 +1617,7 @@ recnWindow2 (GtkWidget *parent, Account *account) static void recnWindow2_add_widget (GtkUIManager *merge, GtkWidget *widget, - GtkVBox *dock) + GtkBox *dock) { gtk_box_pack_start (GTK_BOX (dock), widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -1673,10 +1674,12 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, gnc_recn_set_window_name (recnData); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_container_add (GTK_CONTAINER(recnData->window), vbox); - dock = gtk_vbox_new (FALSE, 0); + dock = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (dock), FALSE); gtk_widget_show (dock); gtk_box_pack_start (GTK_BOX (vbox), dock, FALSE, TRUE, 0); @@ -1741,11 +1744,12 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, /* The main area */ { GtkWidget *frame = gtk_frame_new (NULL); - GtkWidget *main_area = gtk_vbox_new (FALSE, 10); + GtkWidget *main_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); GtkWidget *debcred_area = gtk_table_new (1, 2, TRUE); GtkWidget *debits_box; GtkWidget *credits_box; + gtk_box_set_homogeneous (GTK_BOX (main_area), FALSE); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 10); /* Force a reasonable starting size */ @@ -1789,11 +1793,13 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, gtk_container_set_border_width (GTK_CONTAINER (totals_hbox), 5); /* vbox to hold titles */ - title_vbox = gtk_vbox_new (FALSE, 3); + title_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (title_vbox), FALSE); gtk_box_pack_start (GTK_BOX (totals_hbox), title_vbox, FALSE, FALSE, 0); /* vbox to hold values */ - value_vbox = gtk_vbox_new (FALSE, 3); + value_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_set_homogeneous (GTK_BOX (value_vbox), FALSE); gtk_box_pack_start (GTK_BOX (totals_hbox), value_vbox, TRUE, TRUE, 0); /* statement date title/value */ diff --git a/src/import-export/aqb/gnc-gwen-gui.c b/src/import-export/aqb/gnc-gwen-gui.c index 3c744f437d..0e1f671fa1 100644 --- a/src/import-export/aqb/gnc-gwen-gui.c +++ b/src/import-export/aqb/gnc-gwen-gui.c @@ -788,7 +788,12 @@ show_progress(GncGWENGui *gui, Progress *progress) gtk_entry_set_text(GTK_ENTRY(entry), current->title); if (new_box) - gui->other_entries_box = box = gtk_vbox_new(TRUE, 6); + { + gui->other_entries_box = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_box_set_homogeneous (GTK_BOX (gui->other_entries_box), TRUE); + gtk_box_set_homogeneous (GTK_BOX (box), TRUE); + } + gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0); gtk_widget_show(entry); if (new_box) @@ -1121,7 +1126,8 @@ messagebox_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *title, label = gtk_label_new(raw_text); g_free(raw_text); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); - vbox = gtk_vbox_new(TRUE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE); gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_add(GTK_CONTAINER(vbox), label); gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c index 403305d296..3f9724ca93 100644 --- a/src/import-export/qif-imp/assistant-qif-import.c +++ b/src/import-export/qif-imp/assistant-qif-import.c @@ -847,7 +847,8 @@ new_security_page(SCM security_hash_key, gnc_commodity *comm, QIFImportWindow *w " enter a new one."); /* Make the page widget. */ - page = gtk_vbox_new( FALSE, 0 ); + page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (page), FALSE); retval->page = page; g_object_set_data(G_OBJECT(retval->page), "page_struct", retval); page = retval->page;