From fcd163399e8939a7bf9a442b39670feff5f5738c Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 1 Jan 2012 20:45:31 -0500
Subject: [PATCH] Throw around some QZ_UpdateCursor() calls to fix
 wrongly-shown system cursor.

Fixes Bugzilla #1339.
---
 src/video/quartz/SDL_QuartzEvents.m | 2 ++
 src/video/quartz/SDL_QuartzWM.m     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/video/quartz/SDL_QuartzEvents.m b/src/video/quartz/SDL_QuartzEvents.m
index 2406836b9..773eb010b 100644
--- a/src/video/quartz/SDL_QuartzEvents.m
+++ b/src/video/quartz/SDL_QuartzEvents.m
@@ -721,6 +721,8 @@ void QZ_DoActivate (_THIS) {
         QZ_GetMouseLocation (this, &p);
         SDL_PrivateMouseMotion (0, 0, p.x, p.y);
     }
+
+    QZ_UpdateCursor(this);
 }
 
 void QZ_DoDeactivate (_THIS) {
diff --git a/src/video/quartz/SDL_QuartzWM.m b/src/video/quartz/SDL_QuartzWM.m
index e5e45b18b..19d053d97 100644
--- a/src/video/quartz/SDL_QuartzWM.m
+++ b/src/video/quartz/SDL_QuartzWM.m
@@ -436,6 +436,7 @@ SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode) {
             QZ_ChangeGrabState (this, QZ_DISABLE_GRAB);
         
         current_grab_mode = doGrab ? SDL_GRAB_ON : SDL_GRAB_OFF;
+        QZ_UpdateCursor(this);
     }
 
     return current_grab_mode;