From 502875252232cfc7afb47040701b7871c1431f2c Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Tue, 18 Dec 2001 00:24:01 +0000
Subject: Mac: - Swapped cursor hotspot coordinates to ( y, x ) - clipping
 problem with images (Bug 43393)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1870 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/fl_cursor.cxx |  6 +++---
 src/fl_rect.cxx   | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/fl_cursor.cxx b/src/fl_cursor.cxx
index 64c56f2e0..fe75d549f 100644
--- a/src/fl_cursor.cxx
+++ b/src/fl_cursor.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_cursor.cxx,v 1.6.2.6.2.2 2001/12/09 23:45:22 matthiaswm Exp $"
+// "$Id: fl_cursor.cxx,v 1.6.2.6.2.3 2001/12/18 00:24:01 matthiaswm Exp $"
 //
 // Mouse cursor support for the Fast Light Tool Kit (FLTK).
 //
@@ -103,7 +103,7 @@ static Cursor crsrHAND =
     0x8801, 0x4801, 0x2002, 0x2002, 0x1004, 0x0804, 0x0408, 0x0408 },
   { 0x0600, 0x0F00, 0x0F00, 0x0F00, 0x0FC0, 0x0FF8, 0x6FFE, 0xFFFF,
     0xFFFF, 0x7FFF, 0x3FFE, 0x3FFE, 0x1FFC, 0x0FFC, 0x07F8, 0x07F8 },
-  { 5, 1 }
+  { 1, 5 } // Hotspot: ( y, x )
 }, *crsrHANDptr = &crsrHAND;
 static Cursor crsrHELP =
 {
@@ -290,5 +290,5 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) {
 #endif
 
 //
-// End of "$Id: fl_cursor.cxx,v 1.6.2.6.2.2 2001/12/09 23:45:22 matthiaswm Exp $".
+// End of "$Id: fl_cursor.cxx,v 1.6.2.6.2.3 2001/12/18 00:24:01 matthiaswm Exp $".
 //
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
index e58ecffd3..3d55405e1 100644
--- a/src/fl_rect.cxx
+++ b/src/fl_rect.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_rect.cxx,v 1.10.2.4.2.4 2001/12/06 00:17:47 matthiaswm Exp $"
+// "$Id: fl_rect.cxx,v 1.10.2.4.2.5 2001/12/18 00:24:01 matthiaswm Exp $"
 //
 // Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
 //
@@ -340,13 +340,15 @@ void fl_restore_clip() {
   SelectClipRgn(fl_gc, r); //if r is NULL, clip is automatically cleared
 #elif defined(__APPLE__)
 #  if 1
-  RgnHandle portClip = NewRgn();
   GrafPtr port = GetWindowPort( fl_window );
-  CopyRgn( fl_window_region, portClip ); // changed
-  if ( r ) 
-    SectRgn( portClip, r, portClip );
-  SetPortClipRegion( port, portClip );
-  DisposeRgn( portClip );
+  if ( port ) { // port will be NULL if we are using a GWorld (and fl_window_region is invalid)
+    RgnHandle portClip = NewRgn();
+    CopyRgn( fl_window_region, portClip ); // changed
+    if ( r ) 
+      SectRgn( portClip, r, portClip );
+    SetPortClipRegion( port, portClip );
+    DisposeRgn( portClip );
+  }
 #  else
   if (r) SetClip(r);
   else {
@@ -498,5 +500,5 @@ int fl_clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H){
 }
 
 //
-// End of "$Id: fl_rect.cxx,v 1.10.2.4.2.4 2001/12/06 00:17:47 matthiaswm Exp $".
+// End of "$Id: fl_rect.cxx,v 1.10.2.4.2.5 2001/12/18 00:24:01 matthiaswm Exp $".
 //
-- 
cgit v1.2.3