diff -r b72c6db6890b -r 5dc02b23752f src/gui/widgets/qcocoamenu_mac_p.h --- a/src/gui/widgets/qcocoamenu_mac_p.h Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/widgets/qcocoamenu_mac_p.h Tue Jul 06 15:10:48 2010 +0300 @@ -55,13 +55,14 @@ #import QT_FORWARD_DECLARE_CLASS(QMenu) +QT_FORWARD_DECLARE_CLASS(QAction) #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 @protocol NSMenuDelegate - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item; - (void)menuWillOpen:(NSMenu*)menu; -- (void)menuWillClose:(NSMenu*)menu; +- (void)menuDidClose:(NSMenu*)menu; - (BOOL)hasShortcut:(NSMenu *)menu forKey:(NSString *)key forModifiers:(NSUInteger)modifier whichItem:(NSMenuItem**)outItem; @end @@ -71,6 +72,7 @@ @interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu { QMenu *qmenu; + QAction *previousAction; } - (id)initWithQMenu:(QMenu*)menu; - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action;