From: mental <mental@users.sourceforge.net>
Date: Tue, 8 Jul 2008 19:15:49 +0000 (+0000)
Subject: disable motion hints again; still some subtle issues to work out
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=654b1ae3287ef70389cc7791f2147ee21e628285;p=inkscape.git

disable motion hints again; still some subtle issues to work out
---

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index b780927d8..def126cd3 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -49,7 +49,7 @@
 
 // gtk_check_version returns non-NULL on failure
 static bool const HAS_BROKEN_MOTION_HINTS =
-  gtk_check_version(2, 12, 0) != NULL || !HAS_GDK_EVENT_REQUEST_MOTIONS;
+  true || gtk_check_version(2, 12, 0) != NULL || !HAS_GDK_EVENT_REQUEST_MOTIONS;
 
 // Define this to visualize the regions to be redrawn
 //#define DEBUG_REDRAW 1;
@@ -1548,15 +1548,12 @@ sp_canvas_scroll (GtkWidget *widget, GdkEventScroll *event)
     return emit_event (SP_CANVAS (widget), (GdkEvent *) event);
 }
 
+static inline void request_motions(GdkWindow *w, GdkEventMotion *event) {
+    gdk_window_get_pointer(w, NULL, NULL, NULL);
 #if HAS_GDK_EVENT_REQUEST_MOTIONS
-static inline void request_motions(GdkWindow *, GdkEventMotion *event) {
     gdk_event_request_motions(event);
-}
-#else
-static inline void request_motions(GdkWindow *w, GdkEventMotion *) {
-    gdk_window_get_pointer(w, NULL, NULL, NULL);
-}
 #endif
+}
 
 /**
  * Motion event handler for the canvas.