From: Tim Clem tclem@codeweavers.com
The documentation referred to a return value but the method is void.
Also the 'activate' parameter was basically an override; the app would activate regardless of its value if unless the window has the preventsAppActivation flag. --- dlls/winemac.drv/cocoa_window.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f5b3875e909..2358cc70118 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1741,9 +1741,8 @@ - (void) getSiblingWindowsForWindow:(WineWindow*)other ancestor:(WineWindow**)an *ancestorOfOther = otherAncestors.lastObject;; }
- /* Returns whether or not the window was ordered in, which depends on if - its frame intersects any screen. */ - - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate + + - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next forceActivate:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; if (![self isMiniaturized]) @@ -2514,7 +2513,7 @@ - (void) makeKeyAndOrderFront:(id)sender { if ([self isMiniaturized]) [self deminiaturize:nil]; - [self orderBelow:nil orAbove:nil activate:NO]; + [self orderBelow:nil orAbove:nil forceActivate:NO]; [[self ancestorWineWindow] postBroughtForwardEvent];
if (![self isKeyWindow] && !self.disabled && !self.noForeground) @@ -3433,7 +3432,7 @@ void macdrv_order_cocoa_window(macdrv_window w, macdrv_window p, OnMainThreadAsync(^{ [window orderBelow:prev orAbove:next - activate:activate]; + forceActivate:activate]; }); [window.queue discardEventsMatchingMask:event_mask_for_type(WINDOW_BROUGHT_FORWARD) forWindow:window];