removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / menus.h

diff --git a/src/menus.h b/src/menus.h
index 64bbc6c7750e34f64ac1eb2a616675ae85aaa995..bda481d11fb4281a1e264a1767da4c52d7cfed80 100644 (file)
--- a/src/menus.h
+++ b/src/menus.h
@@ -9,8 +9,8 @@
 *
 *======================================================*/
 
-#ifndef _MENUS_H
-#define _MENUS_H
+#ifndef MENUS_H
+#define MENUS_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -18,10 +18,11 @@
 
 #include FORMS_H_LOCATION
 #include "lyx.h"
+#include "LString.h"
 
 class BufferView;
 class LyXView;
-class LString;
+
 
 ///
 class Menus {
@@ -33,21 +34,7 @@ public:
        ///
        void hideMenus();
        ///
-       void openByName(LString const &menuName);
-private:
-       ///
-       void create_menus(int air);
-       ///
-       void ScreenOptions();
-       ///
-       void showCopyright();
-       ///
-       void showLicense();
-       ///
-       void MenuDocu(LString const & docname);
-       ///
-       void handleBufferMenu(int choice);
-       
+       void openByName(string const &menuName);
        ///
        static void ShowFileMenu(FL_OBJECT *ob, long);
        ///
@@ -66,6 +53,20 @@ private:
        static void ShowBufferMenu(FL_OBJECT *ob, long);
        ///
        static void ShowHelpMenu(FL_OBJECT *ob, long);
+private:
+       ///
+       void create_menus(int air);
+       ///
+       void ScreenOptions();
+       ///
+       void showCopyright();
+       ///
+       void showLicense();
+       ///
+       void MenuDocu(string const & docname);
+       ///
+       void handleBufferMenu(int choice);
+       
        /// 
        BufferView *currentView();
        ///