use NEW_TABULAR�to controll all insettabler usage and code

[features.git] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index 1fd54d277271e6e5db134a8448b18f172de739e5..f76633312a0e4612b91d8faa452c96b0058bee82 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -20,9 +20,11 @@
 
 #include <vector>
 #include FORMS_H_LOCATION
-#include "lyxfunc.h"
+#include "commandtags.h"
 #include "combox.h"
 
+class LyXView;
+
 /** The LyX toolbar class
   This class {\em is} the LyX toolbar, and is not likely to be enhanced
   further until we begin the move to Qt. We will probably have to make our
@@ -92,30 +94,13 @@ private:
                ///
                FL_OBJECT * icon;
                ///
-               toolbarItem() {
-                       action = LFUN_NOACTION;
-                       icon = 0;
-               }
+               toolbarItem();
                ///
-               void clean() {
-                       if (icon) {
-                               fl_delete_object(icon);
-                               fl_free_object(icon);
-                               icon = 0;
-                       }
-               }
+               void clean();
                ///
-               ~toolbarItem() {
-                       clean();
-               }
-                       
-               toolbarItem & operator=(const toolbarItem & ti) {
-                       // do we have to check icon and IsBitmap too?
-                       action = ti.action;
-                       icon = 0; // locally we need to get the icon anew
-
-                       return *this;
-               }
+               ~toolbarItem();
+               ///
+               toolbarItem & operator=(toolbarItem const & ti);
        };
 
        /// typedef to simplify things
@@ -152,12 +137,7 @@ private:
 
        /** more...
         */
-       void reset();// {
-//             toollist = 0;
-//             cleaned = false;
-//             
-//             lightReset();
-//     }
+       void reset();
 
        /** more...
         */