diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-23 13:12:29 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-23 13:12:29 (GMT) |
| commit | d9cd51f412cf84ec9cd929e5d35c995b8904b49d (patch) | |
| tree | 96a346dca9eb703127bccea469aa5cd679e958ef /src/gui/widgets | |
| parent | 0ba6a795f786dc19486551fed2344f394b144a08 (diff) | |
| parent | 5138c39116a03e36005a03f47f718fced6cc6d4e (diff) | |
| download | Qt-d9cd51f412cf84ec9cd929e5d35c995b8904b49d.zip Qt-d9cd51f412cf84ec9cd929e5d35c995b8904b49d.tar.gz Qt-d9cd51f412cf84ec9cd929e5d35c995b8904b49d.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'src/gui/widgets')
| -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 |