Tiny clean-ups.

[lyx.git] / src / frontends / xforms / XFormsToolbar.h

diff --git a/src/frontends/xforms/XFormsToolbar.h b/src/frontends/xforms/XFormsToolbar.h
index 3b62f7a778718d798a65801b2175e25ef1f45432..f74fde1b15478eac9801d6110f4bef852e6d45b4 100644 (file)
--- a/src/frontends/xforms/XFormsToolbar.h
+++ b/src/frontends/xforms/XFormsToolbar.h
@@ -36,7 +36,7 @@ public:
        void add(ToolbarBackend::Toolbar const & tb);
 
        /// add an item to a toolbar
-       void add(int action, string const & tooltip);
+       void add(FuncRequest const &, std::string const & tooltip);
 
        /// display toolbar, not implemented
        void displayToolbar(ToolbarBackend::Toolbar const & tb, bool show);
@@ -45,7 +45,7 @@ public:
        void update();
 
        /// select the right layout in the combox
-       void setLayout(string const & layout);
+       void setLayout(std::string const & layout);
        /// Populate the layout combox.
        void updateLayoutList();
        /// Drop down the layout list
@@ -67,12 +67,16 @@ public:
                /// deallocate icon
                void kill_icon();
 
-               /// lyx action number
-               int action;
+               /// lyx action
+               FuncRequest func;
                /// icon for this item
                FL_OBJECT * icon;
        };
 
+       typedef std::vector<FuncRequest> Funcs;
+
+       Funcs funcs;
+
        typedef std::vector<toolbarItem> ToolbarList;
 
        /// The list containing all the buttons
@@ -89,4 +93,4 @@ public:
        int ypos;
 };
 
-#endif 
+#endif