fix compilation bug

[lyx.git] / src / funcrequest.h

diff --git a/src/funcrequest.h b/src/funcrequest.h
index 8b3de7b1e6d29f47be34732cc55bb437f2c849bd..a9afa49ce1a50233c53400536c48e5e2653377d5 100644 (file)
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -10,11 +10,12 @@
 #define FUNCREQUEST_H
 
 #include "commandtags.h"
+#include "frontends/mouse_state.h"
 #include "LString.h"
 
 class BufferView;
 
-/** 
+/**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
  */
@@ -24,18 +25,33 @@ public:
        FuncRequest();
        /// actions without extra argument
        explicit FuncRequest(kb_action act);
+       /// actions without extra argument
+       FuncRequest(kb_action act, int x, int y, mouse_button::state button);
        /// actions with extra argument
        FuncRequest(kb_action act, string const & arg);
        /// actions without extra argument
-       FuncRequest(BufferView * view, kb_action act);
+       FuncRequest(BufferView * bv, kb_action act);
        /// actions with extra argument
-       FuncRequest(BufferView * view, kb_action act, string const & arg);
+       FuncRequest(BufferView * bv, kb_action act, string const & arg);
        /// for mouse events
-       FuncRequest(BufferView * view, kb_action act, int ax, int ay, int aextra);
+       FuncRequest(BufferView * bv, kb_action act,
+               int x, int y, mouse_button::state button);
+       /// for changing requests a bit
+       FuncRequest(FuncRequest const & cmd, string const & arg);
+       /// for changing requests a bit
+       FuncRequest(FuncRequest const & cmd, BufferView * bv);
+
        /// access to the view
        BufferView * view() const;
        /// access to the view
-       void setView(BufferView * view);
+       void setView(BufferView * bv);
+       /// access to button
+       mouse_button::state button() const;
+
+       /// output a message
+       void message(string const & msg) const;
+       /// output an error message
+       void errorMessage(string const & msg) const;
 
 private:
        /// the BufferView we are talking to
@@ -50,7 +66,7 @@ public:  // should be private, too...
        /// the y coordinate of a mouse press
        int y;
        /// some extra information (like button number)
-       int extra;
+       mouse_button::state button_;
 };
 
 #endif // FUNCREQUEST_H