From bf549e93b93b1c0e0af3cf9e6517c7eb0b89aabb Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 4 May 2012 21:25:08 +0400
Subject: [PATCH] 7147055: [macosx] Cursors are changing over a blocked window;
 also blinking

Reviewed-by: art, kizune
---
 jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java b/jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java
index 1c34353c7b9..de1b537856a 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWCursorManager.java
@@ -88,20 +88,20 @@ public abstract class LWCursorManager {
         } else {
             cursor = (c != null) ? c.getCursor() : null;
         }
-        // TODO: default cursor for modal blocked windows
         setCursor(cursor);
     }
 
     /**
      * Returns the first visible, enabled and showing component under cursor.
+     * Returns null for modal blocked windows.
      *
      * @param cursorPos Current cursor position.
-     * @return Component
+     * @return Component or null.
      */
     private static final Component findComponent(final Point cursorPos) {
         final LWComponentPeer<?, ?> peer = LWWindowPeer.getPeerUnderCursor();
         Component c = null;
-        if (peer != null) {
+        if (peer != null && peer.getWindowPeerOrSelf().getBlocker() == null) {
             c = peer.getTarget();
             if (c instanceof Container) {
                 final Point p = peer.getLocationOnScreen();