From db76b885a2f8562f537c8b00564e98a5ebc8bd7b Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Wed, 14 Jun 2000 10:59:13 +0000
Subject: [PATCH] another cursor fix.

2000-06-15  Michael Natterer  <mitch@gimp.org>

	* app/crop.c (crop_cursor_update): another cursor fix.
---
 app/crop.c               | 10 ++++------
 app/tools/crop.c         | 10 ++++------
 app/tools/gimpcroptool.c | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/crop.c b/app/crop.c
index ccaf5c7297..a34a2781eb 100644
--- a/app/crop.c
+++ b/app/crop.c
@@ -543,7 +543,7 @@ crop_cursor_update (Tool           *tool,
   GDisplay *gdisp;
   Crop     *crop;
 
-  GdkCursorType ctype      = GIMP_CROSSHAIR_SMALL_CURSOR;
+  GdkCursorType ctype      = GIMP_MOUSE_CURSOR;
   CursorModifier cmodifier = CURSOR_MODIFIER_NONE;
 
   gdisp = (GDisplay *) gdisp_ptr;
@@ -557,13 +557,11 @@ crop_cursor_update (Tool           *tool,
   else if (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
 	   mevent->y == CLAMP (mevent->y, crop->y1, crop->y1 + crop->srh))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if (mevent->x == CLAMP (mevent->x, crop->x2 - crop->srw, crop->x2) &&
 	   mevent->y == CLAMP (mevent->y, crop->y2 - crop->srh, crop->y2))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if  (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
@@ -576,10 +574,10 @@ crop_cursor_update (Tool           *tool,
     {
       cmodifier = CURSOR_MODIFIER_MOVE;
     }
-  else if (mevent->x > crop->x1 && mevent->x < crop->x2 &&
-	   mevent->y > crop->y1 && mevent->y < crop->y2)
+  else if (! (mevent->x > crop->x1 && mevent->x < crop->x2 &&
+	      mevent->y > crop->y1 && mevent->y < crop->y2))
     {
-      ctype = GIMP_MOUSE_CURSOR;
+      ctype = GIMP_CROSSHAIR_SMALL_CURSOR;
     }
 
   gdisplay_install_tool_cursor (gdisp, ctype,
diff --git a/app/tools/crop.c b/app/tools/crop.c
index ccaf5c7297..a34a2781eb 100644
--- a/app/tools/crop.c
+++ b/app/tools/crop.c
@@ -543,7 +543,7 @@ crop_cursor_update (Tool           *tool,
   GDisplay *gdisp;
   Crop     *crop;
 
-  GdkCursorType ctype      = GIMP_CROSSHAIR_SMALL_CURSOR;
+  GdkCursorType ctype      = GIMP_MOUSE_CURSOR;
   CursorModifier cmodifier = CURSOR_MODIFIER_NONE;
 
   gdisp = (GDisplay *) gdisp_ptr;
@@ -557,13 +557,11 @@ crop_cursor_update (Tool           *tool,
   else if (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
 	   mevent->y == CLAMP (mevent->y, crop->y1, crop->y1 + crop->srh))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if (mevent->x == CLAMP (mevent->x, crop->x2 - crop->srw, crop->x2) &&
 	   mevent->y == CLAMP (mevent->y, crop->y2 - crop->srh, crop->y2))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if  (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
@@ -576,10 +574,10 @@ crop_cursor_update (Tool           *tool,
     {
       cmodifier = CURSOR_MODIFIER_MOVE;
     }
-  else if (mevent->x > crop->x1 && mevent->x < crop->x2 &&
-	   mevent->y > crop->y1 && mevent->y < crop->y2)
+  else if (! (mevent->x > crop->x1 && mevent->x < crop->x2 &&
+	      mevent->y > crop->y1 && mevent->y < crop->y2))
     {
-      ctype = GIMP_MOUSE_CURSOR;
+      ctype = GIMP_CROSSHAIR_SMALL_CURSOR;
     }
 
   gdisplay_install_tool_cursor (gdisp, ctype,
diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c
index ccaf5c7297..a34a2781eb 100644
--- a/app/tools/gimpcroptool.c
+++ b/app/tools/gimpcroptool.c
@@ -543,7 +543,7 @@ crop_cursor_update (Tool           *tool,
   GDisplay *gdisp;
   Crop     *crop;
 
-  GdkCursorType ctype      = GIMP_CROSSHAIR_SMALL_CURSOR;
+  GdkCursorType ctype      = GIMP_MOUSE_CURSOR;
   CursorModifier cmodifier = CURSOR_MODIFIER_NONE;
 
   gdisp = (GDisplay *) gdisp_ptr;
@@ -557,13 +557,11 @@ crop_cursor_update (Tool           *tool,
   else if (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
 	   mevent->y == CLAMP (mevent->y, crop->y1, crop->y1 + crop->srh))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if (mevent->x == CLAMP (mevent->x, crop->x2 - crop->srw, crop->x2) &&
 	   mevent->y == CLAMP (mevent->y, crop->y2 - crop->srh, crop->y2))
     {
-      ctype     = GIMP_MOUSE_CURSOR;
       cmodifier = CURSOR_MODIFIER_RESIZE;
     }
   else if  (mevent->x == CLAMP (mevent->x, crop->x1, crop->x1 + crop->srw) &&
@@ -576,10 +574,10 @@ crop_cursor_update (Tool           *tool,
     {
       cmodifier = CURSOR_MODIFIER_MOVE;
     }
-  else if (mevent->x > crop->x1 && mevent->x < crop->x2 &&
-	   mevent->y > crop->y1 && mevent->y < crop->y2)
+  else if (! (mevent->x > crop->x1 && mevent->x < crop->x2 &&
+	      mevent->y > crop->y1 && mevent->y < crop->y2))
     {
-      ctype = GIMP_MOUSE_CURSOR;
+      ctype = GIMP_CROSSHAIR_SMALL_CURSOR;
     }
 
   gdisplay_install_tool_cursor (gdisp, ctype,