Painter and scrollbar API patches

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index ec8898c242102c5607fd1a27bf6d83bb6475184f..387f85e9619afff362bc6aa172233c90e782e28a 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,14 +6,19 @@
 #pragma interface
 #endif
 
-#include <X11/Xlib.h>
-#include <sigc++/signal_system.h>
 
 #include "commandtags.h" // for kb_action enum
 #include "FuncStatus.h"
 #include "kbsequence.h"
 #include "LString.h"
 
+#include "frontends/mouse_state.h"
+#include "frontends/key_state.h"
+
+#include <boost/signals/trackable.hpp>
+
+#include <X11/Xlib.h>
+
 class LyXView;
 class LyXText;
 
@@ -24,7 +29,7 @@ class LyXText;
     keyboard or from the GUI. All GUI objects, including buttons and
     menus should use this class and never call kernel functions directly.
 */
-class LyXFunc : public SigC::Object {
+class LyXFunc : public boost::signals::trackable {
 public:
        ///
        explicit
@@ -52,7 +57,7 @@ public:
        void initMiniBuffer();
 
        ///
-       void processKeySym(KeySym k, unsigned int state);
+       void processKeySym(KeySym key, key_modifier::state state);
 
        /// we need one internal which is called from inside LyXAction and
        /// can contain the string argument.
@@ -89,7 +94,7 @@ private:
        ///
        kb_sequence cancel_meta_seq;
        ///
-       unsigned meta_fake_bit;
+       key_modifier::state meta_fake_bit;
        ///
        void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
@@ -139,7 +144,7 @@ private:
 inline
 bool LyXFunc::wasMetaKey() const
 {
-       return (meta_fake_bit != 0);
+       return (meta_fake_bit != key_modifier::none);
 }