gnumeric r17184 - in trunk: . src

[guelzow svn gnome org]

Author: guelzow
Date: Wed Mar 11 02:10:42 2009
New Revision: 17184
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17184&view=rev

Log:
2009-03-10  Andreas J. Guelzow <aguelzow pyrshep ca>

	* src/commands.h (cmd_so_set_value): add Sheet* argument. 
	  Fixes #574734

	* src/commands.c (cmd_so_set_value): use new Sheet* argument
	  that gives the sheet of the widget rather than the sheet of the
	  associated cell

	* src/sheet-object-widget.c: adjust all callers of cmd_so_set_value




Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/commands.c
   trunk/src/commands.h
   trunk/src/sheet-object-widget.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Mar 11 02:10:42 2009
@@ -5,6 +5,7 @@
 	* Always print the whole printarea even if it has no
 	  content or style. [#554116] [#572818]
 	* Fix translation of argument names for empty names.
+	* Don't switch sheets when widgets are adjusted. [#574734]
 
 Morten:
 	* Fix multihead issues with cell comments.

Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c	(original)
+++ trunk/src/commands.c	Wed Mar 11 02:10:42 2009
@@ -6716,7 +6716,8 @@
 cmd_so_set_value (WorkbookControl *wbc,
 		  const char *text,
 		  const GnmCellRef *pref,
-		  GnmValue *new_val)
+		  GnmValue *new_val,
+		  Sheet *sheet)
 {
 	CmdSOSetValue *me;
 	GnmRange r;
@@ -6727,7 +6728,7 @@
 	r.start.row = r.end.row = pref->row;
 
 	me = g_object_new (CMD_SO_SET_VALUE_TYPE, NULL);
-	me->cmd.sheet = pref->sheet;
+	me->cmd.sheet = sheet;
 	me->cmd.size = 1;
 	me->cmd.cmd_descriptor = g_strdup (text);
 	me->ref = *pref;

Modified: trunk/src/commands.h
==============================================================================
--- trunk/src/commands.h	(original)
+++ trunk/src/commands.h	Wed Mar 11 02:10:42 2009
@@ -162,7 +162,8 @@
 gboolean cmd_so_set_value (WorkbookControl *wbc,
 			   const char *text,
 			   const GnmCellRef *pref,
-			   GnmValue *new_val);
+			   GnmValue *new_val,
+			   Sheet *sheet);
 
 G_END_DECLS
 

Modified: trunk/src/sheet-object-widget.c
==============================================================================
--- trunk/src/sheet-object-widget.c	(original)
+++ trunk/src/sheet-object-widget.c	Wed Mar 11 02:10:42 2009
@@ -784,7 +784,8 @@
 		cmd_so_set_value (widget_wbc (widget),
 				  /* FIXME: This text sucks:  */
 				  _("Change widget"),
-				  &ref, value_new_int (new_val));
+				  &ref, value_new_int (new_val),
+				  sheet_object_get_sheet (SHEET_OBJECT (swa)));
 		swa->being_updated = FALSE;
 	}
 }
@@ -1457,7 +1458,8 @@
 		cmd_so_set_value (widget_wbc (GTK_WIDGET (button)),
 				  /* FIXME: This text sucks:  */
 				  _("Clicking checkbox"),
-				  &ref, value_new_bool (new_val));
+				  &ref, value_new_bool (new_val),
+				  sheet_object_get_sheet (SHEET_OBJECT (swc)));
 	}
 }
 
@@ -2092,7 +2094,8 @@
 		    sheet_widget_list_base_get_ref (swl, &ref, TRUE) != NULL)
 			cmd_so_set_value (wbc,
 				_("Clicking in list"),
-				&ref, value_new_int (swl->selection));
+					  &ref, value_new_int (swl->selection),
+					  sheet_object_get_sheet (SHEET_OBJECT (swl)));
 
 		g_signal_emit (G_OBJECT (swl),
 			list_base_signals [LIST_BASE_SELECTION_CHANGED], 0);