remove LFUN_TOOLBAR_PUSH

[lyx.git] / src / frontends / Toolbar.h

diff --git a/src/frontends/Toolbar.h b/src/frontends/Toolbar.h
index bee96e3ee5f4f4e14c9fb95e899b914f55ee75c7..7fe691d0e15c1a5d9f5f1c33c89085869577ce6d 100644 (file)
--- a/src/frontends/Toolbar.h
+++ b/src/frontends/Toolbar.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
@@ -22,18 +22,20 @@
 
 class LyXView;
 class ToolbarDefaults;
+class Dialogs;
 
 /** The LyX GUI independent toolbar class
-  The GUI interface is implemented in the corresponding Toolbar_pimpl class. 
+  The GUI interface is implemented in the corresponding Toolbar_pimpl class.
   */
 class Toolbar {
 public:
        ///
-       Toolbar(LyXView * o, int x, int y, ToolbarDefaults const &);
+       Toolbar(LyXView * o, Dialogs & d,
+               int x, int y, ToolbarDefaults const &);
 
        ///
        ~Toolbar();
-       
+
        /// (re)sets the toolbar
        void set(bool doingmain = false);
 
@@ -41,32 +43,35 @@ public:
          frame, where you can change the toolbar realtime. */
        void edit();
        /// add a new button to the toolbar.
-       void add(int , bool doclean = true);
+       void add(int , bool doclean = true);
        /// name of func instead of kb_action
        void add(string const & , bool doclean = true);
-       /// invokes the n'th icon in the toolbar
-       void push(int);
-       /// activates the toolbar
-        void activate();
-       /// deactivates the toolbar
-        void deactivate();
        /// update the state of the icons
        void update();
 
        /// update the layout combox
-       void setLayout(int layout);
-       /// Populate the layout combox; re-do everything if force is true.
-       void updateLayoutList(bool force);
+       void setLayout(string const & layout);
+       /**
+        * Populate the layout combox - returns whether we did a full
+        * update or not
+        */
+       bool updateLayoutList(int textclass);
        /// Drop down the layout list
        void openLayoutList();
        /// Erase the layout list
        void clearLayoutList();
 
-private:
+       /// Compaq cxx 6.5 requires this to be public
        struct Pimpl;
+private:
        ///
        friend struct Toolbar::Pimpl;
        ///
        Pimpl * pimpl_;
+
+       /**
+        * The last textclass layout list in the layout choice selector
+        */
+       int last_textclass_;
 };
 #endif