diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 12:42:32 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 12:44:08 (GMT) |
| commit | f65ed7b51a573dd8429feecc19c7abe8a0a36114 (patch) | |
| tree | 5ce70bc3ca67573b4a3b07c13e1a8a8be520f4bd /src/gui/widgets/qcocoamenu_mac_p.h | |
| parent | 3464a05a94c4e638d91b2151d6aad70f78ea3087 (diff) | |
| download | Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.zip Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.tar.gz Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.tar.bz2 | |
Remove some warnings in the Cocoa build.
After discussing with some of the Objective-C
people I have finally got a fair number of the
warnings to disappear in both 10.5 and 10.6. I
also took the opportunity to remove a bunch of
other warnings.
Reviewed by: Morten Sørvig
Diffstat (limited to 'src/gui/widgets/qcocoamenu_mac_p.h')
| -rw-r--r-- | src/gui/widgets/qcocoamenu_mac_p.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h index cd53692..8eb6fba 100644 --- a/src/gui/widgets/qcocoamenu_mac_p.h +++ b/src/gui/widgets/qcocoamenu_mac_p.h @@ -56,16 +56,23 @@ QT_FORWARD_DECLARE_CLASS(QMenu) -@interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu -{ - QMenu *qmenu; -} -- (id)initWithQMenu:(QMenu*)menu; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 + +@protocol NSMenuDelegate <NSObject> - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item; - (void)menuWillOpen:(NSMenu*)menu; - (void)menuWillClose:(NSMenu*)menu; - (BOOL)hasShortcut:(NSMenu *)menu forKey:(NSString *)key forModifiers:(NSUInteger)modifier whichItem:(NSMenuItem**)outItem; +@end + +#endif + +@interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu <NSMenuDelegate> +{ + QMenu *qmenu; +} +- (id)initWithQMenu:(QMenu*)menu; - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action; @end #endif |