winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate.

We can't prevent Cocoa from bringing disabled/no-activate windows forward. So, we need to tell Wine about the z-order change. We still do avoid telling Wine to activate disabled/no-activate windows, though.

winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate.
2b97f8c1 · Ken Thomases · Alexandre Julliard · d6f527af · 2b97f8c1
Commit 2b97f8c1 authored Jan 29, 2015 by Ken Thomases Committed by Alexandre Julliard Feb 02, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +1 -2

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -1587,7 +1587,6 @@ int macdrv_err_on;
        BOOL broughtWindowForward = FALSE;

        if ([window isKindOfClass:[WineWindow class]] &&
-            !window.disabled && !window.noActivate &&
            type == NSLeftMouseDown &&
            (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask))
        {
@@ -1693,7 +1692,7 @@ int macdrv_err_on;
            else if (broughtWindowForward)
            {
                [[window ancestorWineWindow] postBroughtForwardEvent];
-                if (![window isKeyWindow])
+                if (![window isKeyWindow] && !window.disabled && !window.noActivate)
                    [self windowGotFocus:window];
            }
        }