Ken Thomases : winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 05c250dfcb394a41ac96c51fcaa40a10f411c2d3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=05c250dfcb394a41ac96c51fca...

Author: Ken Thomases 
Date:   Thu May 16 18:41:59 2013 -0500

winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu.

---

dlls/winemac.drv/cocoa_window.m |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index daa1e66..3e60c84 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1020,9 +1020,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)

- (BOOL) validateMenuItem:(NSMenuItem *)menuItem
     {
+        BOOL ret = [super validateMenuItem:menuItem];
+
         if ([menuItem action] == @selector(makeKeyAndOrderFront:))
-            return [self isKeyWindow] || (!self.disabled && !self.noActivate);
-        return [super validateMenuItem:menuItem];
+            ret = [self isKeyWindow] || (!self.disabled && !self.noActivate);
+
+        return ret;
     }

/* We don't call this.  It's the action method of the items in the Window menu. */