diff --git a/ChangeLog b/ChangeLog index 35e878b5ac..324e2762ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2005-11-30 David Hampton + * src/register/register-gnome/gnucash-header.c: + * src/business/business-gnome/dialog-date-close.c: + * src/gnome-utils/gnc-date-edit.c: + * src/gnome-utils/gnc-html-graph-gog.c: + * src/gnome-utils/dialog-options.c: + * src/gnome/window-reconcile.c: + * src/gnome/dialog-sxsincelast.c: + * src/gnome/dialog-tax-info.c: + * src/gnome-search/search-account.c: + * src/gnome-search/dialog-search.c: Eliminate the deprecated + function gtk_widget_set_usize(). + * src/register/register-gnome/gnucash-date-picker.c: * src/business/business-gnome/search-owner.c: * src/gnome-utils/gnc-query-list.c: diff --git a/src/business/business-gnome/dialog-date-close.c b/src/business/business-gnome/dialog-date-close.c index 04191e49a1..eff8fc64fe 100644 --- a/src/business/business-gnome/dialog-date-close.c +++ b/src/business/business-gnome/dialog-date-close.c @@ -141,7 +141,7 @@ build_date_close_window (GtkWidget *hbox, const char *message) /* Add some extra space on the right to balance the pixmap */ if (pixmap) { alignment = gtk_alignment_new (0., 0., 0., 0.); - gtk_widget_set_usize (alignment, GNOME_PAD, -1); + gtk_widget_set_size_request (alignment, GNOME_PAD, -1); gtk_widget_show (alignment); gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0); diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index 6e85861c0e..199496508f 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -250,7 +250,7 @@ gnc_search_dialog_display_results (GNCSearchWindow *sw) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_usize(GTK_WIDGET(scroller), 300, 100); + gtk_widget_set_size_request(GTK_WIDGET(scroller), 300, 100); gtk_container_add (GTK_CONTAINER (scroller), sw->result_list); /* Create the button_box */ diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index ac7286e3fb..91c1c5e11b 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -263,7 +263,7 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi) /* Create the account scroller and put the tree in it */ accounts_scroller = gtk_scrolled_window_new (NULL, NULL); gtk_container_add(GTK_CONTAINER(accounts_scroller), account_tree); - gtk_widget_set_usize(GTK_WIDGET(accounts_scroller), 300, 300); + gtk_widget_set_size_request(GTK_WIDGET(accounts_scroller), 300, 300); /* Create the label */ label = gtk_label_new (_("Select Accounts to Match")); diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c index ee43b47ecf..e4e5f76960 100644 --- a/src/gnome-utils/dialog-options.c +++ b/src/gnome-utils/dialog-options.c @@ -833,7 +833,7 @@ gnc_option_create_list_widget(GNCOption *option, char *name) GTK_POLICY_AUTOMATIC); width = gtk_clist_columns_autosize(GTK_CLIST(clist)); - gtk_widget_set_usize(scroll_win, width + 50, 0); + gtk_widget_set_size_request(scroll_win, width + 50, -1); gtk_box_pack_start(GTK_BOX(hbox), scroll_win, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(scroll_win), 5); @@ -1606,7 +1606,7 @@ gnc_option_set_ui_widget_account_list (GNCOption *option, GtkBox *page_box, G_CALLBACK(gnc_option_account_cb), option); // gtk_clist_set_row_height(GTK_CLIST(value), 0); - // gtk_widget_set_usize(value, 0, GTK_CLIST(value)->row_height * 10); + // gtk_widget_set_size_request(value, -1, GTK_CLIST(value)->row_height * 10); gtk_widget_show_all(*enclosing); return value; } @@ -1679,7 +1679,7 @@ gnc_option_set_ui_widget_list (GNCOption *option, GtkBox *page_box, num_lines = MIN(num_lines, 9) + 1; gtk_clist_set_row_height(GTK_CLIST(value), 0); - gtk_widget_set_usize(value, 0, GTK_CLIST(value)->row_height * num_lines); + gtk_widget_set_size_request(value, -1, GTK_CLIST(value)->row_height * num_lines); gtk_widget_show_all(*enclosing); return value; } @@ -1752,7 +1752,7 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkBox *page_box, g_free(string); - gtk_widget_set_usize(value, width, 0); + gtk_widget_set_size_request(value, width, -1); } } diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index 44ea806d07..0c1f3e4f67 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -654,7 +654,7 @@ create_children (GNCDateEdit *gde) gde->time_entry = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY(gde->time_entry), 12); - gtk_widget_set_usize (GTK_WIDGET(gde->time_entry), 88, 0); + gtk_widget_set_size_request (GTK_WIDGET(gde->time_entry), 88, -1); gtk_box_pack_start (GTK_BOX (gde), gde->time_entry, TRUE, TRUE, 0); gde->time_popup = gtk_option_menu_new (); diff --git a/src/gnome-utils/gnc-html-graph-gog.c b/src/gnome-utils/gnc-html-graph-gog.c index 7681f9787e..20a949dab2 100644 --- a/src/gnome-utils/gnc-html-graph-gog.c +++ b/src/gnome-utils/gnc-html-graph-gog.c @@ -196,7 +196,7 @@ addPixbufGraphWidget( GtkHTMLEmbedded *eb, GogObject *graph ) gtk_container_add( GTK_CONTAINER(eb), widget ); // blindly copied from gnc-html-guppi.c.. - gtk_widget_set_usize(GTK_WIDGET(eb), eb->width, eb->height); + gtk_widget_set_size_request(GTK_WIDGET(eb), eb->width, eb->height); } static gboolean diff --git a/src/gnome/dialog-sxsincelast.c b/src/gnome/dialog-sxsincelast.c index a9a534aa0f..4544d89b05 100644 --- a/src/gnome/dialog-sxsincelast.c +++ b/src/gnome/dialog-sxsincelast.c @@ -2948,7 +2948,7 @@ sxsincelast_tc_row_sel( GtkCTree *ct, (gpointer)1 ); } - gtk_widget_set_usize( entry, 64, 0 ); + gtk_widget_set_size_request( entry, 64, -1 ); numValue = (gnc_numeric*)g_hash_table_lookup( tci->varBindings, varName ); if ( numValue != NULL ) { diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index 55b344d2ff..252a7eeed0 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -674,7 +674,7 @@ gnc_tax_info_dialog_create (GtkWidget * parent, TaxInfoDialog *ti_dialog) font = gdk_font_from_description (style->font_desc); if (font) - gtk_widget_set_usize (text, 0, (font->ascent + font->descent) * 5 + 6); + gtk_widget_set_size_request (text, -1, (font->ascent + font->descent) * 5 + 6); } clist = glade_xml_get_widget (xml, "txf_category_clist"); diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index 2144fce958..3c6c7e5750 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1761,7 +1761,7 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, bonobo_dock_set_client_area(BONOBO_DOCK(dock), frame); /* Force a reasonable starting size */ - gtk_widget_set_usize(GTK_WIDGET(recnData->window), 800, 600); + gtk_window_set_default_size(GTK_WINDOW(recnData->window), 800, 600); gtk_container_add(GTK_CONTAINER(frame), main_area); gtk_container_set_border_width(GTK_CONTAINER(main_area), 10); @@ -1872,8 +1872,8 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, rlist = GNC_RECONCILE_LIST(recnData->credit); height = gnc_reconcile_list_get_needed_height(rlist, num_show); - gtk_widget_set_usize(recnData->credit, 0, height); - gtk_widget_set_usize(recnData->debit, 0, height); + gtk_widget_set_size_request(recnData->credit, -1, height); + gtk_widget_set_size_request(recnData->debit, -1, height); } } diff --git a/src/register/register-gnome/gnucash-header.c b/src/register/register-gnome/gnucash-header.c index 6dd2565ad0..ed5992fcb1 100644 --- a/src/register/register-gnome/gnucash-header.c +++ b/src/register/register-gnome/gnucash-header.c @@ -326,7 +326,7 @@ gnc_header_reconfigure (GncHeader *header) 0, 0, w, h); if (old_height != h) - gtk_widget_set_usize (GTK_WIDGET(canvas), -1, h); + gtk_widget_set_size_request (GTK_WIDGET(canvas), -1, h); gnc_header_request_redraw (header); }