Ken Thomases : winemac: Remove some duplicated code from -makeKeyAndOrderFront:.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4b2f4eb60002c129785c6801b51d5c92c32c8fd5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4b2f4eb60002c129785c6801b5...

Author: Ken Thomases 
Date:   Fri Aug 30 00:00:44 2013 -0500

winemac: Remove some duplicated code from -makeKeyAndOrderFront:.

---

dlls/winemac.drv/cocoa_window.m |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 48c5056..f68a37c 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1119,26 +1119,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
     /* We don't call this.  It's the action method of the items in the Window menu. */
     - (void) makeKeyAndOrderFront:(id)sender
     {
-        WineApplicationController* controller = [WineApplicationController sharedController];
-        WineWindow* front = [controller frontWineWindow];
-        BOOL wasVisible = [self isVisible];
-
         if (![self isKeyWindow] && !self.disabled && !self.noActivate)
-            [controller windowGotFocus:self];
+            [[WineApplicationController sharedController] windowGotFocus:self];

-        if (front && [self level] < [front level])
-            [self setLevel:[front level]];
-        [self orderFront:nil];
-        if (!wasVisible && fullscreen && [self isOnActiveSpace])
-            [controller updateFullscreenWindows];
-        [controller adjustWindowLevels];
-
-        if (pendingMinimize)
-        {
-            ignore_windowMiniaturize = TRUE;
-            [self miniaturize:nil];
-            pendingMinimize = FALSE;
-        }
+        if ([self isMiniaturized])
+            [self deminiaturize:nil];
+        [self orderBelow:nil orAbove:nil activate:NO];
     }

- (void) sendEvent:(NSEvent*)event