Abdelrazak Younes a écrit :
Bennett Helm a écrit :
+#ifdef Q_WS_MACX
Oups, I missed that one. New patch attached.
Abdel.
Index: D:/msys/home/yns/src/lyx-svn/trunk/src/frontends/qt4/QLMenubar.h
===================================================================
--- D:/msys/home/yns/src/lyx-svn/trunk/src/frontends/qt4/QLMenubar.h
(revision 13312)
+++ D:/msys/home/yns/src/lyx-svn/trunk/src/frontends/qt4/QLMenubar.h
(working copy)
@@ -15,11 +15,12 @@
#include "frontends/Menubar.h"
-#include <map>
+#include <map>
+#include <boost/scoped_ptr.hpp>
#include <QObject>
+#include <QMenuBar>
-class QMenuBar;
class QMenu;
class LyXView;
class MenuBackend;
@@ -58,7 +59,7 @@
// void updateMenu();
private:
- /// Initialize specific MACOS X menubar
+ /// Initialize specific MACOS X menubar.
void QLMenubar::macxMenuBarInit();
/// owning view
@@ -72,9 +73,8 @@
/// name to menu for openByName
NameMap name_map_;
-#ifdef Q_WS_MACX
+ /// MACOS X special menubar.
boost::scoped_ptr<QMenuBar> menubar_;
-#endif
};
} // namespace frontend
