Try to ensure that clipping regions are ready before filling a frame; clean up unixWm.test

1 files changed, 5 insertions, 7 deletions

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index dfa5701..48e8d1a 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -819,28 +819,26 @@ FrontWindowAtPoint(
     int y)
 {
     NSPoint p = NSMakePoint(x, TkMacOSXZeroScreenHeight() - y);
-    NSArray *windows = [NSApp orderedWindows];
-    TkWindow *winPtr = NULL;
 
-    for (NSWindow *w in windows) {
-	winPtr = TkMacOSXGetTkWindow(w);
+    for (NSWindow *w in [NSApp orderedWindows]) {
+	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 	if (winPtr) {
 	    NSRect windowFrame = [w frame];
-	    NSRect contentFrame = [w frame];
+	    NSRect contentFrame = windowFrame;
 
-	    contentFrame.size.height = [[w contentView] frame].size.height;
 	    /*
 	     * For consistency with other platforms, points in the
 	     * title bar are not considered to be contained in the
 	     * window.
 	     */
 
+	    contentFrame.size.height = [[w contentView] frame].size.height;
 	    if (NSMouseInRect(p, contentFrame, NO)) {
 		return winPtr;
 	    } else if (NSMouseInRect(p, windowFrame, NO)) {
 		/*
 		 * The pointer is in the title bar of the highest NSWindow
-		 * containing it, and therefore is should not be considered
+		 * containing it, and therefore it should not be considered
 		 * to be contained in any Tk window.
 		 */
 		return NULL;