move inset related stuff from src/graphics to src/inset/

[lyx.git] / src / insets / insettabular.h

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index ccaa6a8a0e79fec86de574cb09d0389636dcb4ee..7e6fbd2dccb059e09e136a156db1080a4bbd3d05 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -45,9 +45,6 @@
 #ifndef INSETTABULAR_H
 #define INSETTABULAR_H
 
-#include <sigc++/signal_system.h>
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -58,6 +55,10 @@
 #include "lyxcursor.h"
 #include "FuncStatus.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <sigc++/signal_system.h>
+
 class LyXLex;
 class Painter;
 class BufferView;
@@ -100,7 +101,7 @@ public:
        ///
        string const editMessage() const;
        ///
-       void edit(BufferView *, int x, int y, unsigned int);
+       void edit(BufferView *, int x, int y, mouse_button::state);
        ///
        void edit(BufferView * bv, bool front = true);
        ///
@@ -131,13 +132,11 @@ public:
        ///
        bool display() const { return tabular->IsLongTabular(); }
        ///
-       bool insetButtonRelease(BufferView *, int, int, int);
-       ///
-       void insetButtonPress(BufferView *, int, int, int);
+       bool insetButtonRelease(BufferView *, int, int, mouse_button::state);
        ///
-       void insetMotionNotify(BufferView *, int, int, int);
+       void insetButtonPress(BufferView *, int, int, mouse_button::state);
        ///
-       void insetKeyPress(XKeyEvent *);
+       void insetMotionNotify(BufferView *, int, int, mouse_button::state);
        ///
        UpdatableInset::RESULT localDispatch(BufferView *, kb_action,
                                             string const &);
@@ -287,11 +286,11 @@ private:
        }
        ///
        bool activateCellInset(BufferView *, int x = 0, int y = 0,
-                              int button = 0,
+                              mouse_button::state button = mouse_button::none,
                               bool behind = false);
        ///
        bool activateCellInsetAbs(BufferView *, int x = 0, int y = 0,
-                                 int button = 0);
+                                 mouse_button::state button = mouse_button::none);
        ///
        bool insetHit(BufferView * bv, int x, int y) const;
        ///