Revert 23154.

[lyx.git] / src / ToolbarBackend.h

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 6149a6f99b4fc789ff774b3333044bcb5129d976..cd4828efa4c71b4e145281293e01a6efdea22971 100644 (file)
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <vector>
 
@@ -21,7 +21,7 @@
 namespace lyx {
 
 
-class LyXLex;
+class Lexer;
 
 class ToolbarItem {
 public:
@@ -35,7 +35,11 @@ public:
                /// a special combox insead of a button
                LAYOUTS,
                /// a special widget to insert tabulars
-               TABLEINSERT
+               TABLEINSERT,
+               ///
+               POPUPMENU,
+               ///
+               ICONPALETTE
        };
 
        ToolbarItem(Type type,
@@ -73,7 +77,8 @@ public:
                LEFT = 64, //< show at left
                RIGHT = 128, //< show at right
                REVIEW = 256, //< show when change tracking is enabled
-               AUTO = 512  //< only if AUTO is set, when MATH, TABLE and REVIEW is used
+               AUTO = 512,  //< only if AUTO is set, when MATH, TABLE and REVIEW is used
+               MATHMACROTEMPLATE = 1024 //< show in math macro template
        };
        /// the toolbar items
        typedef std::vector<ToolbarItem> Items;
@@ -91,9 +96,11 @@ public:
        Items items;
        /// flags
        Flags flags;
+       /// store flags when coming to fullscreen mode
+       Flags before_fullscreen;
 
        /// read a toolbar from the file
-       ToolbarInfo & read(LyXLex &);
+       ToolbarInfo & read(Lexer &);
 
 private:
        /// add toolbar item
@@ -118,17 +125,18 @@ public:
        Toolbars::iterator end() { return usedtoolbars.end(); }
 
        /// read toolbars from the file
-       void readToolbars(LyXLex &);
+       void readToolbars(Lexer &);
 
        /// read ui toolbar settings
-       void readToolbarSettings(LyXLex &);
+       void readToolbarSettings(Lexer &);
+
        ///
-       ToolbarInfo const & getToolbar(std::string const & name) const;
+       ToolbarInfo const * getDefinedToolbarInfo(std::string const & name) const;
        ///
-       ToolbarInfo & getToolbar(std::string const & name);
+       ToolbarInfo * getUsedToolbarInfo(std::string const & name);
 
 private:
-       /// all the toolbars
+       /// all the defined toolbars
        Toolbars toolbars;
 
        /// toolbars listed