summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenubar_p.h
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-02-09 09:39:37 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-02-10 09:14:33 (GMT)
commit8b112609b7d86572fbb41dc59354da1f958d1910 (patch)
tree4304da66aef9ab4245decf1009752cff6eac1b9b /src/gui/widgets/qmenubar_p.h
parent2a1bf99770401576f451806b2e2a8c73853ca99b (diff)
downloadQt-8b112609b7d86572fbb41dc59354da1f958d1910.zip
Qt-8b112609b7d86572fbb41dc59354da1f958d1910.tar.gz
Qt-8b112609b7d86572fbb41dc59354da1f958d1910.tar.bz2
Cocoa: Menu in menubar stays highlighted
If you use the menu bar for a window to open up another window woth no menu bar, the first menu bar stays highlighted once it is set as current again. The reason is that we remove the first menu bar before cocoa gets a chance to update it correctly. This patch implements a system for us to post a message/call to cocoa, so we delay removing the toolbar until after cocoa has finished closing it properly. NB: Rather than posting the call to a window on screen, it would have been better and safer to post it no window, and then receive the event in the event handler of NSApplication. But for the moment, we have decided not to subclass NSApplication... Rev-By:prasanth
Diffstat (limited to 'src/gui/widgets/qmenubar_p.h')
-rw-r--r--src/gui/widgets/qmenubar_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index f2e5357..819aee4 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -196,6 +196,7 @@ public:
return 0;
}
} *mac_menubar;
+ static bool macUpdateMenuBarImmediatly();
bool macWidgetHasNativeMenubar(QWidget *widget);
void macCreateMenuBar(QWidget *);
void macDestroyMenuBar();