gnumeric r16629 - in trunk: . src src/widgets

[jody svn gnome org]

Author: jody
Date: Mon Jun 16 19:43:45 2008
New Revision: 16629
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16629&view=rev

Log:
	* src/item-edit.c (item_edit_dispose) : delete the feedback ranges.
	  Don't disable their creation into the future.

	* gnumeric-expr-entry.c (gee_scan_for_range) : When selecting the
	  corner of a merge highlight the whole thing, not just the corner.
	  Fixes #127415.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/item-edit.c
   trunk/src/widgets/ChangeLog
   trunk/src/widgets/gnumeric-expr-entry.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jun 16 19:43:45 2008
@@ -11,7 +11,9 @@
 	* Fix xls import of DDE/OLE links (unimplemented).
 	* Fix xls import of empty pre-biff8 headers/footers.
 	* Fix menu warnings with newer Gtk+.
-	* POlish win32 installer. [#534231]
+	* Polish win32 installer. [#534231]
+	* Fix range highlighting while editing.
+	* Fix highlighting of merged cells. [#127415]
 
 Morten:
 	* Fix Excel export problem for strings that need quoting.  [#530704]

Modified: trunk/src/item-edit.c
==============================================================================
--- trunk/src/item-edit.c	(original)
+++ trunk/src/item-edit.c	Mon Jun 16 19:43:45 2008
@@ -418,12 +418,8 @@
 	item_edit_cursor_blink_stop (ie);
 
 	/* to destroy the feedback ranges */
-	gnm_expr_entry_disable_highlight (
-		wbcg_get_entry_logical (scg_wbcg (ie->scg)));
-#if 0
-	/* Why?  */
-	scg_set_display_cursor (ie->scg);
-#endif
+	SCG_FOREACH_PANE (ie->scg, pane,
+		gnm_pane_expr_cursor_stop (pane););
 
 	if (ie->gfont != NULL) {
 		gnm_font_unref (ie->gfont);

Modified: trunk/src/widgets/gnumeric-expr-entry.c
==============================================================================
--- trunk/src/widgets/gnumeric-expr-entry.c	(original)
+++ trunk/src/widgets/gnumeric-expr-entry.c	Mon Jun 16 19:43:45 2008
@@ -379,6 +379,12 @@
 		gnm_expr_entry_find_range (gee);
 		if (gnm_expr_entry_get_rangesel (gee, &range, &parse_sheet) &&
 		    parse_sheet == sheet) {
+
+			GnmRange const *merge; /* [#127415] */
+			if (range_is_singleton  (&range) &&
+			    NULL != (merge = gnm_sheet_merge_is_corner (parse_sheet, &range.start)))
+				range = *merge;
+
 			SCG_FOREACH_PANE (gee->scg, pane,
 				gnm_pane_expr_cursor_bound_set (pane, &range););
 			return;