gnumeric r17280 - in trunk: . src src/dialogs

[guelzow svn gnome org]

Author: guelzow
Date: Thu Apr  2 00:34:38 2009
New Revision: 17280
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17280&view=rev

Log:
2009-04-01  Andreas J. Guelzow <aguelzow pyrshep ca>

	* src/wbc-gtk.c (wbcg_sheet_focus): scg might be NULL 
	
2009-04-01  Andreas J. Guelzow <aguelzow pyrshep ca>

	* dialog-preferences.c (double_pref_create_widget): setting a
	  non-zero pagesize for the adjustment of a spinbutton is deprecated.
	(int_pref_create_widget): ditto




Modified:
   trunk/ChangeLog
   trunk/src/dialogs/ChangeLog
   trunk/src/dialogs/dialog-preferences.c
   trunk/src/wbc-gtk.c

Modified: trunk/src/dialogs/dialog-preferences.c
==============================================================================
--- trunk/src/dialogs/dialog-preferences.c	(original)
+++ trunk/src/dialogs/dialog-preferences.c	Thu Apr  2 00:34:38 2009
@@ -306,7 +306,7 @@
 			gint_conf_setter_t setter, char const *default_label)
 {
 	GtkWidget *w = gtk_spin_button_new (GTK_ADJUSTMENT (
-		gtk_adjustment_new (val, from, to, step, step, step)),
+		gtk_adjustment_new (val, from, to, step, step, 0)),
 		1, 0);
 	int_pref_conf_to_widget (node, key, GTK_SPIN_BUTTON (w));
 	gtk_table_attach (GTK_TABLE (table), w,
@@ -349,7 +349,7 @@
 			   char const *default_label)
 {
 	GtkWidget *w =  gtk_spin_button_new (GTK_ADJUSTMENT (
-		gtk_adjustment_new (val, from, to, step, step, step)),
+		gtk_adjustment_new (val, from, to, step, step, 0)),
 		1, digits);
 	double_pref_conf_to_widget (node, key, GTK_SPIN_BUTTON (w));
 	gtk_table_attach (GTK_TABLE (table), w,

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Thu Apr  2 00:34:38 2009
@@ -1313,16 +1313,18 @@
 		int n = gtk_notebook_page_num (wbcg->snotebook,
 					       GTK_WIDGET (scg->table));
 		gnm_notebook_set_current_page (wbcg->bnotebook, n);
-	}
 
-	if (wbcg->rangesel == NULL)
-		gnm_expr_entry_set_scg (wbcg->edit_line.entry, scg);
+		if (wbcg->rangesel == NULL)
+			gnm_expr_entry_set_scg (wbcg->edit_line.entry, scg);
+	}
 
 	disconnect_sheet_focus_signals (wbcg);
 
 	if (sheet) {
 		wbcg_update_menu_feedback (wbcg, sheet);
-		wbcg_set_direction (scg);
+		
+		if (scg) 
+			wbcg_set_direction (scg);
 
 #if 0
 		g_printerr ("Connecting for %s with scg=%p\n", sheet->name_unquoted, scg);