Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[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 43aa965fda54d04435b3c0c77f57ef1d4a77631f..6eea76f59429891ccfafbd3a9a2bdeed8609a02c 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,22 +14,27 @@
 #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
   */
 struct Toolbar::Pimpl {
 public:
+       /// called when user selects a layout from combox
+       static void layoutSelectedCB(int, void *, Combox *);
        ///
        Pimpl(LyXView * o, int x, int y);
 
@@ -38,19 +43,15 @@ public:
                clean();
        }
        
-#if 0
-       ///
-       int get_toolbar_func(string const & func);
-#endif
-       
        /// (re)sets the toolbar
        void set(bool doingmain = false);
 
        /** this is to be the entry point to the toolbar
-         frame, where you can change the toolbar realtime. */
+           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);
        /// invokes the n'th icon in the toolbar
        void push(int);
        /// activates the toolbar
@@ -60,6 +61,7 @@ public:
        /// update the state of the icons
        void update();
 
+ 
        /// select the right layout in the combox
        void setLayout(int layout);
        /// Populate the layout combox; re-do everything if force is true.
@@ -68,6 +70,8 @@ public:
        void openLayoutList();
        /// Erase the layout list
        void clearLayoutList();
+       /// the non-static version of layoutSelectedCB
+       void layoutSelected(); 
 
        ///
        struct toolbarItem
@@ -91,7 +95,7 @@ public:
        /// The list containing all the buttons
        ToolbarList toollist;
        ///
-       LyXView * owner;
+       XFormsView * owner;
 #if FL_REVISION < 89
        ///
        FL_OBJECT * bubble_timer;
@@ -99,7 +103,9 @@ public:
        ///
        Combox * combox;
        /// Starting position
-       int sxpos, sypos;
+       int sxpos;
+       ///
+       int sypos;
        ///
        int xpos;
        ///
@@ -110,12 +116,10 @@ public:
        /// removes all toolbar buttons from the toolbar.
        void clean();
 
-       /** more...
-        */
+       /// more...
        void reset();
 
-       /** more...
-        */
+       /// more...
        void lightReset();
 };
 #endif