// Clear all menubar contents before filling it.
owner_->menuBar()->clear();
+#ifdef Q_WS_MACX
// setup special mac specific menu item
macxMenuBarInit();
+#endif
LYXERR(Debug::GUI, "populating menu bar" << to_utf8(menubackend_.getMenubar().name()));
that this menubar will be used also when one of LyX' dialogs has
focus. (JMarc)
*/
-QMenuBar * GuiMenubar::menuBar() const
-{
-#ifdef Q_WS_MACX
- return mac_menubar_;
-#else
- return owner_->menuBar();
-#endif
-}
-
-#ifdef Q_WS_MACX
-extern void qt_mac_set_menubar_merge(bool b);
-#endif
void GuiMenubar::macxMenuBarInit()
{
-#ifdef Q_WS_MACX
mac_menubar_ = new QMenuBar;
/* Since Qt 4.2, the qt/mac menu code has special code for
qMenu->addAction(action);
}
-#endif // Q_WS_MACX
}
} // namespace frontend
/// return the menu controller
MenuBackend const & backend() { return menubackend_; }
- /// The QMenuBar used by LyX
- QMenuBar * menuBar() const;
-
/// update the state of the menuitems - not needed
void updateView();