layout as string

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

diff --git a/src/frontends/xforms/Toolbar_pimpl.h b/src/frontends/xforms/Toolbar_pimpl.h
index bbafe2373ca028bf237149c1917c1fda40f21d9e..5bdaba476baafc6f59d5ca747d94694a1d26b76a 100644 (file)
--- a/src/frontends/xforms/Toolbar_pimpl.h
+++ b/src/frontends/xforms/Toolbar_pimpl.h
@@ -4,9 +4,9 @@
  * 
  *           LyX, The Document Processor
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
- *           This file is Copyright 1996-2000
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
  * ====================================================== */
@@ -14,17 +14,20 @@
 #ifndef TOOLBAR_PIMPL_H
 #define TOOLBAR_PIMPL_H
 
+#include <vector>
+#include FORMS_H_LOCATION
+
 #include "frontends/Toolbar.h"
 
+#include "commandtags.h"
+#include "combox.h"
+#include "ToolbarDefaults.h"
+
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <vector>
-#include FORMS_H_LOCATION
-#include "commandtags.h"
-#include "combox.h"
-#include "ToolbarDefaults.h"
+class XFormsView;
 
 /** The LyX xforms toolbar class
   */
@@ -40,11 +43,6 @@ public:
                clean();
        }
        
-#if 0
-       ///
-       int get_toolbar_func(string const & func);
-#endif
-       
        /// (re)sets the toolbar
        void set(bool doingmain = false);
 
@@ -63,17 +61,16 @@ public:
        /// update the state of the icons
        void update();
 
- 
        /// select the right layout in the combox
-       void setLayout(int layout);
+       void setLayout(string const & layout);
        /// Populate the layout combox; re-do everything if force is true.
        void updateLayoutList(bool force);
        /// Drop down the layout list
        void openLayoutList();
        /// Erase the layout list
        void clearLayoutList();
-       /// and the non-static version
-       void layoutSelected(int); 
+       /// the non-static version of layoutSelectedCB
+       void layoutSelected(); 
 
        ///
        struct toolbarItem
@@ -97,7 +94,7 @@ public:
        /// The list containing all the buttons
        ToolbarList toollist;
        ///
-       LyXView * owner;
+       XFormsView * owner;
 #if FL_REVISION < 89
        ///
        FL_OBJECT * bubble_timer;