Updated to tk 8.4.1

[pf3gnuchains/sourceware.git] / tk / generic / tkPointer.c

diff --git a/tk/generic/tkPointer.c b/tk/generic/tkPointer.c
index f51e82b..b9f2617 100644 (file)
--- a/tk/generic/tkPointer.c
+++ b/tk/generic/tkPointer.c
@@ -20,7 +20,13 @@
 #include "tkWinInt.h"
 #endif
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL)
+#include "tkMacInt.h"
+#define Cursor XCursor
+#endif
+
+#if defined(MAC_OSX_TK)
+#include "tkMacOSXInt.h"
 #define Cursor XCursor
 #endif
 
@@ -561,7 +567,7 @@ UpdateCursor(winPtr)
        if (winPtr->atts.cursor != None) {
            cursor = winPtr->atts.cursor;
            break;
-       } else if (winPtr->flags & TK_TOP_LEVEL) {
+       } else if (winPtr->flags & TK_TOP_HIERARCHY) {
            break;
        }
        winPtr = winPtr->parentPtr;
@@ -645,4 +651,3 @@ TkGenerateActivateEvents(winPtr, active)
     TkQueueEventForAllChildren(winPtr, &event);
     
 }
-