From 4959040015b639ab4a554bc4e8457058e7cc5cf2 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 25 Dec 2007 21:34:53 +0000
Subject: [PATCH] * GuiMenuBar: - Get rid of unused menuBar() method. - make
 sure mac specific code always compile.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22302 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiMenubar.cpp   | 16 ++--------------
 src/frontends/qt4/GuiMenubar.h     |  3 ---
 src/frontends/qt4/GuiPopupMenu.cpp |  3 +--
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/frontends/qt4/GuiMenubar.cpp b/src/frontends/qt4/GuiMenubar.cpp
index 5f3ee78164..9926ea0caf 100644
--- a/src/frontends/qt4/GuiMenubar.cpp
+++ b/src/frontends/qt4/GuiMenubar.cpp
@@ -45,8 +45,10 @@ void GuiMenubar::init()
 	// 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()));
 
@@ -137,22 +139,9 @@ void GuiMenubar::openByName(QString const & 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
@@ -215,7 +204,6 @@ void GuiMenubar::macxMenuBarInit()
 		qMenu->addAction(action);
 
 	}
-#endif // Q_WS_MACX
 }
 
 } // namespace frontend
diff --git a/src/frontends/qt4/GuiMenubar.h b/src/frontends/qt4/GuiMenubar.h
index e4e11312a2..545bd76291 100644
--- a/src/frontends/qt4/GuiMenubar.h
+++ b/src/frontends/qt4/GuiMenubar.h
@@ -48,9 +48,6 @@ public:
 	/// 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();
 
diff --git a/src/frontends/qt4/GuiPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp
index 6a37dc896f..e29a06954d 100644
--- a/src/frontends/qt4/GuiPopupMenu.cpp
+++ b/src/frontends/qt4/GuiPopupMenu.cpp
@@ -16,14 +16,13 @@
 #include "Action.h"
 #include "GuiPopupMenu.h"
 #include "qt_helpers.h"
+
 #include "LyXFunc.h"
 #include "MenuBackend.h"
 
 #include "support/lstrings.h"
 #include "support/debug.h"
 
-#include <QMenuBar>
-
 namespace lyx {
 namespace frontend {
 
-- 
2.39.2