diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoansmenu.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoansmenu.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.h b/src/plugins/platforms/cocoa/qcocoansmenu.h index a9c3e4fff9..6cbb6e4a01 100644 --- a/src/plugins/platforms/cocoa/qcocoansmenu.h +++ b/src/plugins/platforms/cocoa/qcocoansmenu.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -53,12 +53,10 @@ #import <AppKit/AppKit.h> -#include <QtCore/qpointer.h> #include <qcocoahelpers.h> QT_FORWARD_DECLARE_CLASS(QCocoaMenu); -typedef QPointer<QCocoaMenu> QCocoaMenuPointer; - +QT_FORWARD_DECLARE_CLASS(QCocoaMenuItem); @interface QT_MANGLE_NAMESPACE(QCocoaNSMenuDelegate) : NSObject <NSMenuDelegate> @@ -72,18 +70,24 @@ typedef QPointer<QCocoaMenu> QCocoaMenuPointer; @interface QT_MANGLE_NAMESPACE(QCocoaNSMenu) : NSMenu -@property (readonly, nonatomic) QCocoaMenuPointer qpaMenu; +@property (readonly, nonatomic) QCocoaMenu *platformMenu; + +- (instancetype)initWithPlatformMenu:(QCocoaMenu *)menu; + +@end -- (instancetype)initWithQPAMenu:(QCocoaMenu *)menu; +@interface QT_MANGLE_NAMESPACE(QCocoaNSMenuItem) : NSMenuItem -- (void)qt_itemFired:(NSMenuItem *)item; +@property (nonatomic) QCocoaMenuItem *platformMenuItem; -- (BOOL)worksWhenModal; -- (BOOL)validateMenuItem:(NSMenuItem*)item; // NSMenuValidation ++ (instancetype)separatorItemWithPlatformMenuItem:(QCocoaMenuItem *)menuItem; +- (instancetype)initWithPlatformMenuItem:(QCocoaMenuItem *)menuItem; +- (instancetype)init; @end QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaNSMenu); +QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaNSMenuItem); QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaNSMenuDelegate); #endif // QCOCOANSMENU_H |