[Gnucash-changes] r12074 - gnucash/trunk - More trivial conversions
from deprecated gtk/gnome functions to
David Hampton
hampton at cvs.gnucash.org
Wed Nov 30 19:45:16 EST 2005
Author: hampton
Date: 2005-11-30 19:45:13 -0500 (Wed, 30 Nov 2005)
New Revision: 12074
Trac: http://svn.gnucash.org/trac/changeset/12074
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
gnucash/trunk/src/business/business-gnome/dialog-billterms.c
gnucash/trunk/src/business/business-gnome/search-owner.c
gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
gnucash/trunk/src/gnome-search/dialog-search.c
gnucash/trunk/src/gnome-search/gnc-general-search.c
gnucash/trunk/src/gnome-search/search-account.c
gnucash/trunk/src/gnome-search/search-boolean.c
gnucash/trunk/src/gnome-search/search-date.c
gnucash/trunk/src/gnome-search/search-double.c
gnucash/trunk/src/gnome-search/search-int64.c
gnucash/trunk/src/gnome-search/search-numeric.c
gnucash/trunk/src/gnome-search/search-reconciled.c
gnucash/trunk/src/gnome-search/search-string.c
gnucash/trunk/src/gnome-utils/dialog-account.c
gnucash/trunk/src/gnome-utils/dialog-commodity.c
gnucash/trunk/src/gnome-utils/dialog-options.c
gnucash/trunk/src/gnome-utils/dialog-transfer.c
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/gnc-date-delta.c
gnucash/trunk/src/gnome-utils/gnc-date-edit.c
gnucash/trunk/src/gnome-utils/gnc-frequency.c
gnucash/trunk/src/gnome-utils/gnc-general-select.c
gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
gnucash/trunk/src/gnome-utils/gnc-gui-query.c
gnucash/trunk/src/gnome/dialog-sxsincelast.c
gnucash/trunk/src/gnome/druid-loan.c
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/lot-viewer.c
gnucash/trunk/src/gnome/window-reconcile.c
gnucash/trunk/src/import-export/binary-import/druid-commodity.c
gnucash/trunk/src/import-export/gnc-import-format-gnome.c
gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
gnucash/trunk/src/network-utils/gnc-http.c
gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
Log:
More trivial conversions from deprecated gtk/gnome functions to
supported functions.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/ChangeLog 2005-12-01 00:45:13 UTC (rev 12074)
@@ -1,3 +1,8 @@
+2005-11-30 David Hampton <hampton at employees.org>
+
+ * various: More trivial conversions from deprecated gtk/gnome
+ functions to supported functions.
+
2005-11-29 David Hampton <hampton at employees.org>
* src/gnome-utils/gw-gnome-utils-spec.scm:
Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -292,7 +292,7 @@
g_object_set_data (G_OBJECT (item), "this_item", this_item);
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (business_option_changed), omd);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
}
Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -148,7 +148,7 @@
gnc_numeric val;
gdouble fl = 0.0;
- fl = gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (widget));
+ fl = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
val = double_to_gnc_numeric (fl, 100000, GNC_RND_ROUND);
func (term, val);
}
@@ -326,7 +326,8 @@
show_notebook (BillTermNB *notebook)
{
g_return_if_fail (notebook->type > 0);
- gtk_notebook_set_page (GTK_NOTEBOOK (notebook->notebook), notebook->type-1);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook->notebook),
+ notebook->type-1);
}
static void
Modified: gnucash/trunk/src/business/business-gnome/search-owner.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/search-owner.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/business/business-gnome/search-owner.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -136,7 +136,7 @@
GNCSearchOwner *
gnc_search_owner_new (void)
{
- GNCSearchOwner *o = (GNCSearchOwner *)gtk_type_new(gnc_search_owner_get_type ());
+ GNCSearchOwner *o = g_object_new(gnc_search_owner_get_type (), NULL);
return o;
}
@@ -219,7 +219,7 @@
g_object_set_data (G_OBJECT (item), "option", (gpointer) type);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (type_option_changed),
user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
@@ -274,7 +274,7 @@
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (how_option_changed),
user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -187,7 +187,7 @@
item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", GINT_TO_POINTER (type));
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (optionmenu_changed), ntt);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome/dialog-sxsincelast.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sxsincelast.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome/dialog-sxsincelast.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -1791,7 +1791,6 @@
for ( l = autoCreateList; l; l = l->next ) {
total += g_list_length( ((toCreateTuple*)l->data)->instanceList );
}
- gtk_progress_configure( GTK_PROGRESS(sxsld->prog), 0, 0, total );
gnc_suspend_gui_refresh();
for ( ; autoCreateList ; autoCreateList = autoCreateList->next ) {
Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome/druid-loan.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -1122,12 +1122,12 @@
rouid = (RepayOptUIData*)ud;
escrowCb = GTK_TOGGLE_BUTTON(rouid->escrowCb);
/* make sure the escrow option is only selected if we're active. */
- gtk_toggle_button_set_state( escrowCb,
- gtk_toggle_button_get_active(
+ gtk_toggle_button_set_active( escrowCb,
+ gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(
rouid->ldd->optEscrowCb) )
- && rouid->optData->throughEscrowP
- && gtk_toggle_button_get_active(tb) );
+ && rouid->optData->throughEscrowP
+ && gtk_toggle_button_get_active(tb) );
/* make sure the escrow option is only sensitive if we're active, and
* the escrow account is enabled */
gtk_widget_set_sensitive( GTK_WIDGET(escrowCb),
@@ -1164,8 +1164,7 @@
ldd->ld.repPriAcct = ldd->ld.primaryAcct;
}
ldd->ld.principal = gnc_amount_edit_get_amount( ldd->prmOrigPrincGAE );
- ldd->ld.interestRate =
- gtk_spin_button_get_value_as_float( ldd->prmIrateSpin );
+ ldd->ld.interestRate = gtk_spin_button_get_value( ldd->prmIrateSpin );
ldd->ld.type = gnc_option_menu_get_active( GTK_WIDGET(ldd->prmType) );
if ( ldd->ld.type != FIXED ) {
gnc_frequency_save_state( ldd->prmVarGncFreq,
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -342,7 +342,7 @@
{
GNCSplitReg *gsrToRet;
- gsrToRet = GNC_SPLIT_REG( gtk_type_new( gnc_split_reg_get_type() ) );
+ gsrToRet = g_object_new( gnc_split_reg_get_type(), NULL );
gsrToRet->disallowedCaps = disallowCaps;
gsrToRet->numRows = numberOfLines;
@@ -2184,7 +2184,7 @@
* the data path with the problem.
**/
static
-gint
+gboolean
gtk_callback_bug_workaround (gpointer argp)
{
dialog_args *args = argp;
@@ -2248,7 +2248,7 @@
gsr->read_only = TRUE;
/* Put up a warning dialog */
args->gsr = gsr;
- gtk_timeout_add (250, gtk_callback_bug_workaround, args); /* 0.25 seconds */
+ g_timeout_add (250, gtk_callback_bug_workaround, args); /* 0.25 seconds */
}
/* Make the contents immutable */
@@ -2394,17 +2394,17 @@
popup = gsr->popup_menu;
- gtk_menu_append( GTK_MENU(popup), gtk_menu_item_new() );
+ gtk_menu_shell_append( GTK_MENU_SHELL(popup), gtk_menu_item_new() );
tmpMenu = gnc_split_reg_get_edit_menu( gsr );
tmpMI = gtk_menu_item_new_with_label( N_("Edit") );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(tmpMI), tmpMenu );
- gtk_menu_append( GTK_MENU(popup), tmpMI );
+ gtk_menu_shell_append( GTK_MENU_SHELL(popup), tmpMI );
tmpMenu = gnc_split_reg_get_view_menu( gsr );
tmpMI = gtk_menu_item_new_with_label( N_("View") );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(tmpMI), tmpMenu );
- gtk_menu_append( GTK_MENU(popup), tmpMI );
+ gtk_menu_shell_append( GTK_MENU_SHELL(popup), tmpMI );
gtk_widget_show_all( popup );
}
Modified: gnucash/trunk/src/gnome/lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/lot-viewer.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome/lot-viewer.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -244,7 +244,7 @@
str = gnc_lot_get_title (lot);
if (!str) str = "";
gtk_entry_set_text (lv->title_entry, str);
- gtk_entry_set_editable (lv->title_entry, TRUE);
+ gtk_editable_set_editable (GTK_EDITABLE(lv->title_entry), TRUE);
/* Set the notes field */
str = gnc_lot_get_notes (lot);
@@ -274,7 +274,7 @@
/* Blank the title widget */
gtk_entry_set_text (lv->title_entry, "");
- gtk_entry_set_editable (lv->title_entry, FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE(lv->title_entry), FALSE);
/* Blank the notes area */
xxxgtk_textview_set_text (lv->lot_notes, "");
Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome/window-reconcile.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -528,7 +528,7 @@
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (data->end_value), after);
gtk_widget_grab_focus(GTK_WIDGET(entry));
- gtk_entry_select_region (GTK_ENTRY(entry), 0, -1);
+ gtk_editable_select_region (GTK_EDITABLE(entry), 0, -1);
data->original_value = after;
data->user_set_value = FALSE;
}
@@ -699,7 +699,7 @@
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (end_value), *new_ending);
entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (end_value));
- gtk_entry_select_region (GTK_ENTRY(entry), 0, -1);
+ gtk_editable_select_region (GTK_EDITABLE(entry), 0, -1);
g_signal_connect(G_OBJECT(entry), "focus-out-event",
G_CALLBACK(gnc_start_recn_update_cb), (gpointer) &data);
gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
Modified: gnucash/trunk/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/dialog-search.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/dialog-search.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -311,7 +311,7 @@
static void
search_type_cb (GtkToggleButton *button, GNCSearchWindow *sw)
{
- GSList * buttongroup = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+ GSList * buttongroup = gtk_radio_button_get_group (GTK_RADIO_BUTTON(button));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
sw->search_type =
@@ -637,7 +637,7 @@
item = gtk_menu_item_new_with_label (_(param->title));
g_object_set_data (G_OBJECT (item), "param", param);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_activate), data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
if (param == sw->last_param) /* is this the right parameter to start? */
@@ -781,12 +781,12 @@
item = gtk_menu_item_new_with_label (_("all criteria are met"));
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (match_all), sw);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
item = gtk_menu_item_new_with_label (_("any criteria are met"));
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (match_any), sw);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
omenu = gtk_option_menu_new ();
Modified: gnucash/trunk/src/gnome-search/gnc-general-search.c
===================================================================
--- gnucash/trunk/src/gnome-search/gnc-general-search.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/gnc-general-search.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -258,7 +258,7 @@
create_children (GNCGeneralSearch *gsl, const char *label)
{
gsl->entry = gtk_entry_new ();
- gtk_entry_set_editable (GTK_ENTRY (gsl->entry), FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (gsl->entry), FALSE);
gtk_box_pack_start (GTK_BOX (gsl), gsl->entry, TRUE, TRUE, 0);
gtk_widget_show (gsl->entry);
Modified: gnucash/trunk/src/gnome-search/search-account.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-account.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-account.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -186,7 +186,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-boolean.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-boolean.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-boolean.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -178,7 +178,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-date.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-date.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-date.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -191,7 +191,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK(option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-double.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-double.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-double.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -183,7 +183,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-int64.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-int64.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-int64.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -186,7 +186,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-numeric.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-numeric.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-numeric.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -220,7 +220,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", fcn, user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-reconciled.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-reconciled.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-reconciled.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -186,7 +186,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-search/search-string.c
===================================================================
--- gnucash/trunk/src/gnome-search/search-string.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-search/search-string.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -256,7 +256,7 @@
GtkWidget *item = gtk_menu_item_new_with_label (label);
g_object_set_data (G_OBJECT (item), "option", (gpointer) option);
g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
return item;
}
Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -677,7 +677,7 @@
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(frame), scroll);
- gtk_container_border_width(GTK_CONTAINER(scroll), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll), 5);
gtk_container_add(GTK_CONTAINER(scroll), GTK_WIDGET(list));
gtk_widget_show_all(vbox);
@@ -1107,7 +1107,7 @@
gtk_widget_set_sensitive(aw->opening_balance_page, sensitive);
if (!sensitive)
{
- gtk_notebook_set_page (GTK_NOTEBOOK (aw->notebook), 0);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (aw->notebook), 0);
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (aw->opening_balance_edit),
gnc_numeric_zero ());
}
Modified: gnucash/trunk/src/gnome-utils/dialog-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-commodity.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/dialog-commodity.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -679,7 +679,7 @@
item = gtk_menu_item_new_with_label(gnc_quote_source_get_user_name(source));
gtk_widget_set_sensitive(item, gnc_quote_source_get_supported(source));
gtk_widget_show(item);
- gtk_menu_append(menu, item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
}
omenu = gtk_option_menu_new();
@@ -749,12 +749,12 @@
item = gtk_menu_item_new_with_label(_("Use local time"));
gtk_widget_show(item);
- gtk_menu_append(menu, item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
for(itemstr = &known_timezones[0]; *itemstr; itemstr++) {
item = gtk_menu_item_new_with_label(*itemstr);
gtk_widget_show(item);
- gtk_menu_append(menu, item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
}
omenu = gtk_option_menu_new();
Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -175,7 +175,7 @@
widget = gnc_option_get_widget (option);
- widget_list = gtk_container_children(GTK_CONTAINER(widget));
+ widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
ab_button = g_list_nth_data(widget_list, GNC_RD_WID_AB_BUTTON_POS);
ab_widget = g_list_nth_data(widget_list, GNC_RD_WID_AB_WIDGET_POS);
rel_button = g_list_nth_data(widget_list, GNC_RD_WID_REL_BUTTON_POS);
@@ -710,7 +710,7 @@
GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vbox), scroll_win, TRUE, TRUE, 0);
- gtk_container_border_width(GTK_CONTAINER(scroll_win), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll_win), 5);
gtk_container_add(GTK_CONTAINER(scroll_win), tree);
bbox = gtk_hbutton_box_new();
@@ -836,7 +836,7 @@
gtk_widget_set_usize(scroll_win, width + 50, 0);
gtk_box_pack_start(GTK_BOX(hbox), scroll_win, FALSE, FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(scroll_win), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll_win), 5);
gtk_container_add(GTK_CONTAINER(scroll_win), clist);
bbox = gtk_vbutton_box_new();
@@ -1424,7 +1424,7 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_container_border_width(GTK_CONTAINER(scroll), 2);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll), 2);
gtk_container_add(GTK_CONTAINER(frame), scroll);
@@ -1980,8 +1980,8 @@
{
if (SCM_BOOLP(value))
{
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(widget),
- SCM_NFALSEP(value));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
+ SCM_NFALSEP(value));
return FALSE;
}
else
@@ -2101,7 +2101,7 @@
GList *widget_list;
GtkWidget *rel_date_widget;
- widget_list = gtk_container_children(GTK_CONTAINER(widget));
+ widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
rel_date_widget = g_list_nth_data(widget_list,
GNC_RD_WID_REL_WIDGET_POS);
gnc_date_option_set_select_method(option, FALSE, TRUE);
@@ -2127,7 +2127,7 @@
GList *widget_list;
GtkWidget *ab_widget;
- widget_list = gtk_container_children(GTK_CONTAINER(widget));
+ widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
ab_widget = g_list_nth_data(widget_list,
GNC_RD_WID_AB_WIDGET_POS);
gnc_date_option_set_select_method(option, TRUE, TRUE);
@@ -2367,10 +2367,10 @@
int i;
gpointer val;
- list = gtk_container_children (GTK_CONTAINER (widget));
+ list = gtk_container_get_children (GTK_CONTAINER (widget));
box = list->data;
- list = gtk_container_children (GTK_CONTAINER (box));
+ list = gtk_container_get_children (GTK_CONTAINER (box));
for (i = 0; i < index && list; i++)
list = list->next;
g_return_val_if_fail (list, TRUE);
@@ -2520,7 +2520,7 @@
GList *widget_list;
GtkWidget *ab_button, *rel_widget, *ab_widget;
- widget_list = gtk_container_children(GTK_CONTAINER(widget));
+ widget_list = gtk_container_get_children(GTK_CONTAINER(widget));
ab_button = g_list_nth_data(widget_list, GNC_RD_WID_AB_BUTTON_POS);
ab_widget = g_list_nth_data(widget_list, GNC_RD_WID_AB_WIDGET_POS);
rel_widget = g_list_nth_data(widget_list, GNC_RD_WID_REL_WIDGET_POS);
@@ -2625,7 +2625,7 @@
spinner = GTK_SPIN_BUTTON(widget);
- value = gtk_spin_button_get_value_as_float(spinner);
+ value = gtk_spin_button_get_value(spinner);
return (scm_make_real(value));
}
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -756,8 +756,9 @@
( xferData->desc_start_selection != xferData->desc_end_selection ||
xferData->desc_start_selection == 0 ) )
{
- gtk_entry_select_region( entry, xferData->desc_start_selection,
- xferData->desc_end_selection );
+ gtk_editable_select_region( GTK_EDITABLE(entry),
+ xferData->desc_start_selection,
+ xferData->desc_end_selection );
#if DRH_NEEDS_INVESTIGATION
gtk_old_editable_claim_selection( GTK_OLD_EDITABLE(entry), TRUE, time );
#endif
@@ -822,7 +823,8 @@
/* NOT done with input, though, since we need to focus to the next
* field. Unselect the current field, though.
*/
- gtk_entry_select_region( GTK_ENTRY(xferData->description_entry), 0, 0 );
+ gtk_editable_select_region( GTK_EDITABLE(xferData->description_entry),
+ 0, 0 );
#if DRH_NEEDS_INVESTIGATION
gtk_old_editable_claim_selection( GTK_OLD_EDITABLE(xferData->description_entry),
FALSE, event->time );
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -126,7 +126,7 @@
G_CALLBACK(gnc_option_menu_cb),
option_info[i].user_data);
- gtk_menu_append(GTK_MENU(menu), menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
Modified: gnucash/trunk/src/gnome-utils/gnc-date-delta.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-delta.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-date-delta.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -204,8 +204,8 @@
gdd->units = units;
- gtk_signal_emit (GTK_OBJECT (gdd), date_delta_signals [UNITS_CHANGED]);
- gtk_signal_emit (GTK_OBJECT (gdd), date_delta_signals [DELTA_CHANGED]);
+ g_signal_emit (gdd, date_delta_signals [UNITS_CHANGED], 0);
+ g_signal_emit (gdd, date_delta_signals [DELTA_CHANGED], 0);
}
static void
@@ -229,7 +229,7 @@
{
item = gtk_menu_item_new_with_label (strings[i]);
g_object_set_data(G_OBJECT(item), GDD_LABEL, gdd);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show(item);
g_signal_connect (item, "activate",
@@ -273,7 +273,7 @@
{
item = gtk_menu_item_new_with_label (strings[i]);
g_object_set_data(G_OBJECT(item), GDD_LABEL, gdd);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show(item);
g_signal_connect (item, "activate",
@@ -326,7 +326,7 @@
{
GNCDateDelta *gdd;
- gdd = gtk_type_new (gnc_date_delta_get_type ());
+ gdd = g_object_new (gnc_date_delta_get_type (), NULL);
gdd->show_polarity = show_polarity;
Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -338,7 +338,7 @@
hit->gde = gde;
item = gtk_menu_item_new_with_label (buffer);
- gtk_menu_append (GTK_MENU (menu), item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
#if 0
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (set_time), hit);
@@ -364,7 +364,7 @@
hit->gde = gde;
mins = gtk_menu_item_new_with_label (buffer);
- gtk_menu_append (GTK_MENU (submenu), mins);
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), mins);
g_signal_connect (G_OBJECT (mins), "activate",
G_CALLBACK (set_time), hit);
g_signal_connect (G_OBJECT (item), "destroy",
@@ -652,7 +652,8 @@
gtk_widget_show (GTK_WIDGET(gde->date_button));
- gde->time_entry = gtk_entry_new_with_max_length (12);
+ 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_box_pack_start (GTK_BOX (gde), gde->time_entry, TRUE, TRUE, 0);
Modified: gnucash/trunk/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-frequency.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-frequency.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -279,7 +279,7 @@
}
g_assert( page != -1 );
- gtk_notebook_set_page( gf->nb, page );
+ gtk_notebook_set_current_page( gf->nb, page );
gtk_option_menu_set_history( gf->freqOpt, page );
switch ( uift )
@@ -579,7 +579,7 @@
}
g_assert( page != -1 );
- gtk_notebook_set_page( gf->nb, page );
+ gtk_notebook_set_current_page( gf->nb, page );
gtk_option_menu_set_history( gf->freqOpt, page );
}
@@ -623,7 +623,7 @@
gnc_frequency_new( FreqSpec *fs, GDate *date )
{
GNCFrequency *toRet;
- toRet = gtk_type_new( gnc_frequency_get_type() );
+ toRet = g_object_new( gnc_frequency_get_type(), NULL );
gnc_frequency_setup_default( toRet, fs, date );
return GTK_WIDGET(toRet);
}
@@ -1015,7 +1015,7 @@
/* Set the new page. */
optIdx = gnc_option_menu_get_active( GTK_WIDGET(((GNCFrequency*)d)->freqOpt) );
- gtk_notebook_set_page( ((GNCFrequency*)d)->nb, optIdx );
+ gtk_notebook_set_current_page( ((GNCFrequency*)d)->nb, optIdx );
/* setup initial values for new page, as possible. */
uift = PAGES[optIdx].uiFTVal;
Modified: gnucash/trunk/src/gnome-utils/gnc-general-select.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-general-select.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-general-select.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -209,7 +209,7 @@
create_children (GNCGeneralSelect *gsl, GNCGeneralSelectType type)
{
gsl->entry = gtk_entry_new ();
- gtk_entry_set_editable (GTK_ENTRY (gsl->entry), FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (gsl->entry), FALSE);
gtk_box_pack_start (GTK_BOX (gsl), gsl->entry, TRUE, TRUE, 0);
gtk_widget_show (gsl->entry);
Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -175,7 +175,6 @@
/* initialization required for gtkhtml */
gdk_rgb_init ();
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
- gtk_widget_set_default_visual (gdk_rgb_get_visual ());
/* use custom icon */
fullname = gnc_gnome_locate_pixmap ("gnucash-icon.png");
Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -486,7 +486,7 @@
int i;
main_vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_border_width(GTK_CONTAINER(main_vbox), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5);
gtk_widget_show(main_vbox);
label = gtk_label_new(msg);
@@ -495,19 +495,19 @@
gtk_widget_show(label);
frame = gtk_frame_new(NULL);
- gtk_container_border_width(GTK_CONTAINER(frame), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show(frame);
vbox = gtk_vbox_new(TRUE, 3);
- gtk_container_border_width(GTK_CONTAINER(vbox), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
for (node = radio_list, i = 0; node; node = node->next, i++)
{
radio_button = gtk_radio_button_new_with_label(group, node->data);
- group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio_button));
+ group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
if (i == default_value) /* default is first radio button */
{
Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.c
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -252,9 +252,9 @@
title = g_strdup_printf("Enter information about \"%s\"",
retval->old_name ? retval->old_name : "");
- gnome_druid_page_standard_set_bg_color(page, & std_bg_color);
- gnome_druid_page_standard_set_logo_bg_color(page, & std_logo_bg_color);
- gnome_druid_page_standard_set_title_color(page, & std_title_color);
+ gnome_druid_page_standard_set_background(page, & std_bg_color);
+ gnome_druid_page_standard_set_logo_background(page, & std_logo_bg_color);
+ gnome_druid_page_standard_set_title_foreground(page, & std_title_color);
gnome_druid_page_standard_set_title(page, title);
g_free(title);
Modified: gnucash/trunk/src/import-export/gnc-import-format-gnome.c
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-gnome.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/import-export/gnc-import-format-gnome.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -68,7 +68,7 @@
g_object_set_data(G_OBJECT(item), "option", (gpointer) option);
g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(gnc_ifg_option_changed),
user_data);
- gtk_menu_append(GTK_MENU(menu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
return item;
}
Modified: gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/import-export/qif-import/dialog-account-picker.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -165,7 +165,8 @@
GTK_BUTTONS_OK_CANCEL,
_("Enter a name for the account"));
- entry = gtk_entry_new_with_max_length (250);
+ entry = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(entry), 250);
gtk_widget_show(entry);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox), entry);
Modified: gnucash/trunk/src/network-utils/gnc-http.c
===================================================================
--- gnucash/trunk/src/network-utils/gnc-http.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/network-utils/gnc-http.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -122,7 +122,7 @@
}
}
-static gint
+static gboolean
ghttp_check_callback(gpointer data) {
gnc_http * http = data;
GList * current = NULL;
@@ -241,7 +241,7 @@
if(!http->callback_enabled) {
http->callback_tag =
- gtk_timeout_add(100, ghttp_check_callback, (gpointer)http);
+ g_timeout_add(100, ghttp_check_callback, http);
http->callback_enabled = TRUE;
}
}
@@ -281,7 +281,7 @@
/* start the gtk timeout if not started */
if(!http->callback_enabled) {
http->callback_tag =
- gtk_timeout_add(100, ghttp_check_callback, (gpointer)http);
+ g_timeout_add(100, ghttp_check_callback, http);
http->callback_enabled = TRUE;
}
}
Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2005-11-30 06:00:01 UTC (rev 12073)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c 2005-12-01 00:45:13 UTC (rev 12074)
@@ -2429,7 +2429,7 @@
G_STRUCT_OFFSET(GnucashRegisterClass,
activate_cursor),
NULL, NULL,
- gtk_marshal_NONE__NONE,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
register_signals[REDRAW_ALL] =
@@ -2439,7 +2439,7 @@
G_STRUCT_OFFSET(GnucashRegisterClass,
redraw_all),
NULL, NULL,
- gtk_marshal_NONE__NONE,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
register_signals[REDRAW_HELP] =
@@ -2449,7 +2449,7 @@
G_STRUCT_OFFSET(GnucashRegisterClass,
redraw_help),
NULL, NULL,
- gtk_marshal_NONE__NONE,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
class->activate_cursor = NULL;
More information about the gnucash-changes
mailing list