diff options
author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-16 14:59:15 (GMT) |
---|---|---|
committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-24 09:43:23 (GMT) |
commit | 777b93a0a48096e68124feec4c0e0cab3d60c36a (patch) | |
tree | 80ff05a695db37632d2c1cb213ce340d33cac2e8 /src/gui/widgets/qmenu_p.h | |
parent | f04b5ea9e0f06904f15d93245ef597483ba9e790 (diff) | |
download | Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.zip Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.tar.gz Qt-777b93a0a48096e68124feec4c0e0cab3d60c36a.tar.bz2 |
Get collapsible menus working correctly.
There was an attempt to do this earlier, but it was a bit more complex
than it needed to be. We now do the update on show in Cocoa. Carbon
actually does it all for us, we just need to flip the bit. We may do the
updates to often, but it's better than not enough.
Task-Id: 195445
Reviewed-by: Denis
Diffstat (limited to 'src/gui/widgets/qmenu_p.h')
-rw-r--r-- | src/gui/widgets/qmenu_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index 4e428fe..8697771 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -263,9 +263,8 @@ public: struct QMacMenuPrivate { QList<QMacMenuAction*> actionItems; OSMenuRef menu; - QMenuPrivate *qmenu; - QMacMenuPrivate(QMenuPrivate *menu); - ~QMacMenuPrivate(); + QMacMenuPrivate(); + ~QMacMenuPrivate(); bool merged(const QAction *action) const; void addAction(QAction *, QMacMenuAction* =0, QMenuPrivate *qmenu = 0); @@ -285,6 +284,7 @@ public: } *mac_menu; OSMenuRef macMenu(OSMenuRef merge); void setMacMenuEnabled(bool enable = true); + void syncSeparatorsCollapsible(bool collapsible); static QHash<OSMenuRef, OSMenuRef> mergeMenuHash; static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash; #endif |