diff --git a/src/business/business-gnome/business-options-gnome.c b/src/business/business-gnome/business-options-gnome.c index 265f595c09..280e58edb7 100644 --- a/src/business/business-gnome/business-options-gnome.c +++ b/src/business/business-gnome/business-options-gnome.c @@ -84,7 +84,7 @@ make_name_label (char *name) colon_name = g_strconcat (name, ":", (char *)NULL); label = gtk_label_new (colon_name); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); g_free (colon_name); return label; diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 9661a15f27..665cf10b22 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -1209,11 +1209,11 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) gtk_box_pack_start (GTK_BOX(summarybar), hbox, FALSE, FALSE, 5); label = gtk_label_new (label_str); - gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0); label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0); return label; diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index dd6a7c9df7..eb9532d128 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -32,6 +32,7 @@ #include "qof.h" #include "gnc-tree-view-account.h" #include "gnc-gui-query.h" +#include "dialog-utils.h" #include "search-account.h" #include "search-core-utils.h" @@ -306,7 +307,7 @@ gncs_get_widget (GNCSearchCoreType *fe) /* Build and connect the account entry window */ desc = describe_button (fi); label = gtk_label_new (desc); - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); + gnc_label_set_alignment (label, 0.5, 0.5); button = gtk_button_new (); gtk_container_add (GTK_CONTAINER (button), label); diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index a92f52ba59..a373433eeb 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -663,7 +663,7 @@ verify_children_compatible (AccountWindow *aw) label = gtk_label_new (_("Give the children the same type?")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gnc_label_set_alignment (label, 0.0, 0.0); { gint size; PangoFontDescription *font_desc; @@ -685,7 +685,7 @@ verify_children_compatible (AccountWindow *aw) g_free (str); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); + gnc_label_set_alignment (label, 0.0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); /* children */ diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c index c42442ba11..cab5e48c3c 100644 --- a/src/gnome-utils/dialog-options.c +++ b/src/gnome-utils/dialog-options.c @@ -1923,7 +1923,7 @@ gnc_option_set_ui_widget_string (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -1994,7 +1994,7 @@ gnc_option_set_ui_widget_currency (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2025,7 +2025,7 @@ gnc_option_set_ui_widget_commodity (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2063,7 +2063,7 @@ gnc_option_set_ui_widget_multichoice (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2092,7 +2092,7 @@ gnc_option_set_ui_widget_date (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2163,7 +2163,7 @@ gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); acct_type_list = gnc_option_get_account_type_list(option); @@ -2229,7 +2229,7 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2291,7 +2291,7 @@ gnc_option_set_ui_widget_color (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2327,7 +2327,7 @@ gnc_option_set_ui_widget_font (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2366,7 +2366,7 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box, ENTER("option %p(%s), name %s", option, gnc_option_name(option), name); colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2507,7 +2507,7 @@ gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -2598,7 +2598,7 @@ gnc_option_set_ui_widget_budget (GNCOption *option, GtkBox *page_box, colon_name = g_strconcat(name, ":", NULL); label = gtk_label_new(colon_name); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); g_free(colon_name); *enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c index 8f295936e9..aff874092c 100644 --- a/src/gnome-utils/dialog-preferences.c +++ b/src/gnome-utils/dialog-preferences.c @@ -545,7 +545,7 @@ gnc_preferences_build_page (gpointer data, if (add_in->full_page) { label = gtk_label_new(add_in->tabname); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gnc_label_set_alignment(label, 0.0, 0.5); gtk_notebook_append_page(notebook, new_content, label); g_object_unref(G_OBJECT(builder)); LEAVE("appended page"); @@ -583,7 +583,7 @@ gnc_preferences_build_page (gpointer data, existing_content = gtk_table_new(0, 4, FALSE); gtk_container_set_border_width(GTK_CONTAINER(existing_content), 6); label = gtk_label_new(add_in->tabname); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gnc_label_set_alignment(label, 0.0, 0.5); gtk_notebook_append_page(notebook, existing_content, label); gtk_widget_show_all(existing_content); DEBUG("created new page %s, appended it", add_in->tabname); diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c index f2215db4c5..0edb1504cd 100644 --- a/src/gnome-utils/dialog-utils.c +++ b/src/gnome-utils/dialog-utils.c @@ -224,6 +224,17 @@ gnc_window_adjust_for_screen(GtkWindow * window) gtk_widget_queue_resize(GTK_WIDGET(window)); } +void +gnc_label_set_alignment (GtkWidget *widget, gfloat xalign, gfloat yalign) +{ +#if GTK_CHECK_VERSION(3,16,0) == 0 + gtk_label_set_xalign (GTK_LABEL (widget), xalign); + gtk_label_set_yalign (GTK_LABEL (widget), yalign); +#else + gtk_misc_set_alignment (GTK_MISC (widget), xalign, yalign); +#endif +} + gboolean gnc_handle_date_accelerator (GdkEventKey *event, struct tm *tm, diff --git a/src/gnome-utils/dialog-utils.h b/src/gnome-utils/dialog-utils.h index 06e896a6c0..4e9f77e438 100644 --- a/src/gnome-utils/dialog-utils.h +++ b/src/gnome-utils/dialog-utils.h @@ -61,6 +61,9 @@ void gnc_save_window_size (const char *section, GtkWindow *window); \********************************************************************/ void gnc_window_adjust_for_screen (GtkWindow * window); + +void gnc_label_set_alignment (GtkWidget *widget, gfloat xalign, gfloat yalign); + gboolean gnc_handle_date_accelerator (GdkEventKey *event, struct tm *tm, const char *date_str); diff --git a/src/gnome-utils/gnc-combott.c b/src/gnome-utils/gnc-combott.c index f613eaa15f..d8fdb75090 100644 --- a/src/gnome-utils/gnc-combott.c +++ b/src/gnome-utils/gnc-combott.c @@ -27,10 +27,12 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ +#include "config.h" #include #include "gnc-combott.h" #include #include +#include "dialog-utils.h" enum { @@ -410,7 +412,7 @@ gctt_rebuild_menu (GncCombott *combott, GtkTreeModel *model) /* Add the tooltip to the child label */ label = gtk_bin_get_child(GTK_BIN(menu_items)); gtk_widget_set_tooltip_text (label, tip_data); - gtk_misc_set_alignment (GTK_MISC(label), 0, 0.5); + gnc_label_set_alignment (label, 0, 0.5); /* ...and add it to the menu. */ gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_items); @@ -603,7 +605,7 @@ menuitem_response_cb (GtkMenuItem *item, gpointer *user_data ) /* Set the button Label */ gtk_label_set_text(GTK_LABEL(priv->label), label_text); - gtk_misc_set_alignment (GTK_MISC(priv->label), 0, 0.5); + gnc_label_set_alignment (priv->label, 0, 0.5); /* Get the corresponding entry in the list store */ valid = gtk_tree_model_get_iter_first (priv->model, &iter); @@ -712,7 +714,7 @@ gnc_combott_set_active (GncCombott *combott, gint index) priv->active = index + 1; priv->active_iter = iter; gtk_label_set_text(GTK_LABEL(priv->label), str_data); - gtk_misc_set_alignment (GTK_MISC(priv->label), 0, 0.5); + gnc_label_set_alignment (priv->label, 0, 0.5); g_signal_emit (combott, combott_signals[CHANGED], 0); } diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index ab62aebb76..80c92ea7a1 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -865,7 +865,7 @@ create_children (GNCDateEdit *gde) /* Calendar label, only shown if the date editor has a time field */ gde->cal_label = gtk_label_new (_("Calendar")); - gtk_misc_set_alignment (GTK_MISC (gde->cal_label), 0.0, 0.5); + gnc_label_set_alignment (gde->cal_label, 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), gde->cal_label, TRUE, TRUE, 0); if (gde->flags & GNC_DATE_EDIT_SHOW_TIME) gtk_widget_show (GTK_WIDGET(gde->cal_label)); diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index b22bd16d68..97a06b1a1d 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -1151,7 +1151,7 @@ identity_edit_clicked_cb (GtkButton *button, if (!(g_strcmp0 (ti_dialog->tax_name, NULL) == 0)) gtk_entry_set_text (GTK_ENTRY (name_entry), ti_dialog->tax_name); label = gtk_label_new (_("Name")); - gtk_misc_set_alignment (GTK_MISC (label), 1.00, 0.50); + gnc_label_set_alignment (label, 1.00, 0.50); alignment = gtk_alignment_new(1.00, 0.50, 1.00, 0.00); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); gtk_container_add (GTK_CONTAINER (alignment), label); @@ -1190,7 +1190,7 @@ identity_edit_clicked_cb (GtkButton *button, gtk_combo_box_set_active (GTK_COMBO_BOX (type_combo), -1); } label = gtk_label_new (_("Type")); - gtk_misc_set_alignment (GTK_MISC (label), 1.00, 0.50); + gnc_label_set_alignment (label, 1.00, 0.50); alignment = gtk_alignment_new(1.00, 0.50, 1.00, 0.00); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); gtk_container_add (GTK_CONTAINER (alignment), label); @@ -1201,7 +1201,7 @@ identity_edit_clicked_cb (GtkButton *button, gtk_table_attach_defaults (GTK_TABLE (table), alignment, 1, 2, 1, 2); label = gtk_label_new (_("CAUTION: If you set TXF categories, and later change 'Type', you will need to manually reset those categories one at a time")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.50, 0.50); + gnc_label_set_alignment (label, 0.50, 0.50); alignment = gtk_alignment_new(0.50, 0.50, 1.00, 0.00); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 6, 4, 4); gtk_container_add (GTK_CONTAINER (alignment), label); diff --git a/src/gnome/gnc-plugin-page-sx-list.c b/src/gnome/gnc-plugin-page-sx-list.c index 32198212df..234a24a3e2 100644 --- a/src/gnome/gnc-plugin-page-sx-list.c +++ b/src/gnome/gnc-plugin-page-sx-list.c @@ -382,7 +382,7 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page) gtk_label_set_markup (GTK_LABEL (label), markup); g_free (markup); g_free (text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0); + gnc_label_set_alignment (label, 0.0, 0); gtk_widget_show (label); gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_show (vbox); @@ -445,7 +445,7 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page) gtk_label_set_markup (GTK_LABEL (label), markup); g_free (markup); g_free (text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0); + gnc_label_set_alignment (label, 0.0, 0); gtk_widget_show (label); gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, FALSE, 0); diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index 411692f326..e94c902ca6 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -1004,7 +1004,7 @@ gsr_default_associate_handler_location (GNCSplitReg *gsr, Transaction *trans, gb label = gtk_label_new (_("Enter URL:")); // pack label and entry to content area - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gnc_label_set_alignment (label, 0.0, 0.5); gtk_container_add (GTK_CONTAINER (content_area), label); gtk_container_add (GTK_CONTAINER (content_area), entry); @@ -1991,11 +1991,11 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) gtk_box_pack_start( GTK_BOX(summarybar), hbox, FALSE, FALSE, 5 ); label = gtk_label_new( label_str ); - gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); + gnc_label_set_alignment(label, 1.0, 0.5 ); gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0 ); label = gtk_label_new( "" ); - gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); + gnc_label_set_alignment(label, 1.0, 0.5 ); gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0 ); return label; diff --git a/src/gnome/gnc-split-reg2.c b/src/gnome/gnc-split-reg2.c index 2c33694013..f217979f3b 100644 --- a/src/gnome/gnc-split-reg2.c +++ b/src/gnome/gnc-split-reg2.c @@ -775,11 +775,11 @@ add_summary_label (GtkWidget *summarybar, const char *label_str) gtk_box_pack_start (GTK_BOX (summarybar), hbox, FALSE, FALSE, 5); label = gtk_label_new (label_str); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); return label; diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 9afb3e7d79..d376e3628f 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1180,7 +1180,7 @@ gnc_reconcile_window_create_view_box(Account *account, gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new(_("Total:")); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gnc_label_set_alignment(label, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); label = gtk_label_new(""); @@ -1847,52 +1847,52 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, /* statement date title/value */ title = gtk_label_new(_("Statement Date:")); - gtk_misc_set_alignment(GTK_MISC(title), 1.0, 0.5); + gnc_label_set_alignment(title, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new(""); recnData->recn_date = value; - gtk_misc_set_alignment(GTK_MISC(value), 1.0, 0.5); + gnc_label_set_alignment(value, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0); /* starting balance title/value */ title = gtk_label_new(_("Starting Balance:")); - gtk_misc_set_alignment(GTK_MISC(title), 1.0, 0.5); + gnc_label_set_alignment(title, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 3); value = gtk_label_new(""); recnData->starting = value; - gtk_misc_set_alignment(GTK_MISC(value), 1.0, 0.5); + gnc_label_set_alignment(value, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 3); /* ending balance title/value */ title = gtk_label_new(_("Ending Balance:")); - gtk_misc_set_alignment(GTK_MISC(title), 1.0, 0.5); + gnc_label_set_alignment(title, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new(""); recnData->ending = value; - gtk_misc_set_alignment(GTK_MISC(value), 1.0, 0.5); + gnc_label_set_alignment(value, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0); /* reconciled balance title/value */ title = gtk_label_new(_("Reconciled Balance:")); - gtk_misc_set_alignment(GTK_MISC(title), 1.0, 0.5); + gnc_label_set_alignment(title, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new(""); recnData->reconciled = value; - gtk_misc_set_alignment(GTK_MISC(value), 1.0, 0.5); + gnc_label_set_alignment(value, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0); /* difference title/value */ title = gtk_label_new(_("Difference:")); - gtk_misc_set_alignment(GTK_MISC(title), 1.0, 0.5); + gnc_label_set_alignment(title, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new(""); recnData->difference = value; - gtk_misc_set_alignment(GTK_MISC(value), 1.0, 0.5); + gnc_label_set_alignment(value, 1.0, 0.5); gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0); } diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c index 7b42f5b8cc..f713a84b38 100644 --- a/src/gnome/window-reconcile2.c +++ b/src/gnome/window-reconcile2.c @@ -1143,7 +1143,7 @@ gnc_reconcile_window_create_view_box (Account *account, gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new (_("Total:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gnc_label_set_alignment (label, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); label = gtk_label_new(""); @@ -1807,52 +1807,52 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account, /* statement date title/value */ title = gtk_label_new (_("Statement Date:")); - gtk_misc_set_alignment (GTK_MISC (title), 1.0, 0.5); + gnc_label_set_alignment (title, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new (""); recnData->recn_date = value; - gtk_misc_set_alignment (GTK_MISC (value), 1.0, 0.5); + gnc_label_set_alignment (value, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (value_vbox), value, FALSE, FALSE, 0); /* starting balance title/value */ title = gtk_label_new(_("Starting Balance:")); - gtk_misc_set_alignment (GTK_MISC (title), 1.0, 0.5); + gnc_label_set_alignment (title, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (title_vbox), title, FALSE, FALSE, 3); value = gtk_label_new (""); recnData->starting = value; - gtk_misc_set_alignment (GTK_MISC (value), 1.0, 0.5); + gnc_label_set_alignment (value, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (value_vbox), value, FALSE, FALSE, 3); /* ending balance title/value */ title = gtk_label_new (_("Ending Balance:")); - gtk_misc_set_alignment (GTK_MISC (title), 1.0, 0.5); + gnc_label_set_alignment (title, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new (""); recnData->ending = value; - gtk_misc_set_alignment (GTK_MISC (value), 1.0, 0.5); + gnc_label_set_alignment (value, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (value_vbox), value, FALSE, FALSE, 0); /* reconciled balance title/value */ title = gtk_label_new (_("Reconciled Balance:")); - gtk_misc_set_alignment (GTK_MISC (title), 1.0, 0.5); + gnc_label_set_alignment (title, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new (""); recnData->reconciled = value; - gtk_misc_set_alignment (GTK_MISC (value), 1.0, 0.5); + gnc_label_set_alignment (value, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (value_vbox), value, FALSE, FALSE, 0); /* difference title/value */ title = gtk_label_new (_("Difference:")); - gtk_misc_set_alignment(GTK_MISC (title), 1.0, 0.5); + gnc_label_set_alignment (title, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (title_vbox), title, FALSE, FALSE, 0); value = gtk_label_new (""); recnData->difference = value; - gtk_misc_set_alignment (GTK_MISC (value), 1.0, 0.5); + gnc_label_set_alignment (value, 1.0, 0.5); gtk_box_pack_start (GTK_BOX (value_vbox), value, FALSE, FALSE, 0); } diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c index 9cb57bf076..b9c6679c89 100644 --- a/src/import-export/qif-imp/assistant-qif-import.c +++ b/src/import-export/qif-imp/assistant-qif-import.c @@ -885,7 +885,7 @@ new_security_page(SCM security_hash_key, gnc_commodity *comm, QIFImportWindow *w gnc_commodity_get_fullname(comm)); label = gtk_label_new_with_mnemonic(_("_Name or description:")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), retval->name_entry); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gnc_label_set_alignment(label, 0, 0.5); gtk_widget_set_tooltip_text(label, name_tooltip); gtk_widget_set_tooltip_text(retval->name_entry, name_tooltip); @@ -905,7 +905,7 @@ new_security_page(SCM security_hash_key, gnc_commodity *comm, QIFImportWindow *w label = gtk_label_new_with_mnemonic( _("_Ticker symbol or other abbreviation:")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), retval->mnemonic_entry); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gnc_label_set_alignment(label, 0, 0.5); gtk_widget_set_tooltip_text(label, mnemonic_tooltip); gtk_widget_set_tooltip_text(retval->mnemonic_entry, mnemonic_tooltip); @@ -930,7 +930,7 @@ new_security_page(SCM security_hash_key, gnc_commodity *comm, QIFImportWindow *w label = gtk_label_new_with_mnemonic( _("_Exchange or abbreviation type:")); gtk_label_set_mnemonic_widget(GTK_LABEL(label), retval->namespace_combo); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + ggnc_label_set_alignment(label, 0, 0.5); gtk_widget_set_tooltip_text(label, namespace_tooltip); gtk_widget_set_tooltip_text(retval->namespace_combo, namespace_tooltip);