[gnumeric] Fix tool tip position for recent gtk (2.18 or newer). [#605723]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 346922d33c244b4cf6bef8121a0473d5198843ba
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Mon Jan 4 19:15:57 2010 -0700

    Fix tool tip position for recent gtk (2.18 or newer). [#605723]
    
    2010-01-04 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gui-util.c (gnm_canvas_get_position): call
    	  gdk_window_get_internal_paint_info only for gtk < 2.18

 ChangeLog      |    5 +++++
 NEWS           |    1 +
 src/gui-util.c |    9 ++++++++-
 3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 77cbebe..c21dd64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-04 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gui-util.c (gnm_canvas_get_position): call 
+	  gdk_window_get_internal_paint_info only for gtk < 2.18
+	
 2010-01-01 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/sheet-object-graph.c (sheet_object_graph_guru): change help link
diff --git a/NEWS b/NEWS
index 9396cc9..d8c29f0 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ Andreas:
 	* Select pasted objects. [#604227]
 	* Add auto expression menu items to add formula. [#8872]
 	* Some updates to the Gnumeric manual.
+	* Fix tool tip position for recent gtk (2.18 or newer). [#605723]
 
 Jean
 	* Fix import export of line type in scatter plots. [#605043]
diff --git a/src/gui-util.c b/src/gui-util.c
index 3e04513..ffdc8cb 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -1354,13 +1354,20 @@ gnm_canvas_get_position (GocCanvas *canvas, int *x, int *y, gint64 px, gint64 py
 {
 	GtkWidget *cw = GTK_WIDGET (canvas);
 	GdkWindow *cbw = GTK_LAYOUT (cw)->bin_window;
-	int wx, wy, ox, oy;
+	int wx, wy;
+	int ox = 0, oy = 0;
 
+#ifndef HAVE_GTK_ENTRY_GET_BUFFER
+	/*
+	 *   So we haven't gotten gtk 2.18 yet where we apparently should call
+	 *   this anymore.
+	 */
 	/*
 	 * Get offsets for the 16-bit X11 system within the 32-bit gdk system.
 	 * I don't think this should be necessary, see bug 586756.
 	 */
 	gdk_window_get_internal_paint_info (cbw, NULL, &ox, &oy);
+#endif
 
 	gdk_window_get_origin (cbw, &wx, &wy);