diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 951bbb90c3..a39263ecab 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -107,6 +107,14 @@ QCocoaMenu::QCocoaMenu() : [m_nativeItem setSubmenu:m_nativeMenu]; } +QCocoaMenu::~QCocoaMenu() +{ + [m_nativeItem setSubmenu:nil]; + [m_nativeMenu release]; + [m_delegate release]; + [m_nativeItem release]; +} + void QCocoaMenu::setText(const QString &text) { QCocoaAutoReleasePool pool; @@ -142,6 +150,7 @@ void QCocoaMenu::insertNative(QCocoaMenuItem *item, QCocoaMenuItem *beforeItem) if (item->isMerged()) return; + Q_ASSERT([item->nsItem() menu] == NULL); // if the item we're inserting before is merged, skip along until // we find a non-merged real item to insert ahead of. while (beforeItem && beforeItem->isMerged()) { @@ -163,6 +172,7 @@ void QCocoaMenu::removeMenuItem(QPlatformMenuItem *menuItem) Q_ASSERT(m_menuItems.contains(cocoaItem)); m_menuItems.removeOne(cocoaItem); if (!cocoaItem->isMerged()) { + Q_ASSERT(m_nativeMenu == [cocoaItem->nsItem() menu]); [m_nativeMenu removeItem: cocoaItem->nsItem()]; } } |