diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-24 09:40:26 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-24 09:40:26 (GMT) |
| commit | 8226392be3ea450f8b3f418fb4defd6dc36210f8 (patch) | |
| tree | e3b36f3ef3192a76e52d333cdb83b0e867ba9acb | |
| parent | 5daca044cf8d185d9a09b2ec87cba10244e425e4 (diff) | |
| download | Qt-8226392be3ea450f8b3f418fb4defd6dc36210f8.zip Qt-8226392be3ea450f8b3f418fb4defd6dc36210f8.tar.gz Qt-8226392be3ea450f8b3f418fb4defd6dc36210f8.tar.bz2 | |
Fix NSMenuDelegate protocol implementation.
The member function is called menuDidClose, not
menuWillClose.
| -rw-r--r-- | src/gui/widgets/qcocoamenu_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qcocoamenu_mac_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index fb91aed..c442d5b 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -100,7 +100,7 @@ QT_USE_NAMESPACE qt_mac_menu_collapseSeparators(menu, qtmenu->separatorsCollapsible()); } -- (void)menuWillClose:(NSMenu*)menu; +- (void)menuDidClose:(NSMenu*)menu; { qt_mac_emit_menuSignals(((QT_MANGLE_NAMESPACE(QCocoaMenu) *)menu)->qmenu, false); } diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h index 617f0e9..0c8989a 100644 --- a/src/gui/widgets/qcocoamenu_mac_p.h +++ b/src/gui/widgets/qcocoamenu_mac_p.h @@ -61,7 +61,7 @@ QT_FORWARD_DECLARE_CLASS(QMenu) @protocol NSMenuDelegate <NSObject> - (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 |