multicol; small stuff

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 6eca3068a0dbb0c1529bad2b8dc8a2daec82cd61..1482b175cb5cd591c24f3bbab848f1500391a76d 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,11 +2,6 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
 #include "FuncStatus.h"
 #include "kbsequence.h"
 #include "commandtags.h"
@@ -17,6 +12,7 @@
 class LyXView;
 class LyXText;
 class FuncRequest;
+class BufferView;
 
 
 /** This class encapsulates all the LyX command operations.
@@ -36,7 +32,7 @@ public:
 
        /// Dispatch via a string argument
        void dispatch(string const & s, bool verbose = false);
- 
+
        /// Dispatch via a pseudo action, also displaying shortcut/command name
        void dispatch(int ac, bool verbose = false);
 
@@ -72,9 +68,14 @@ public:
 
 private:
        ///
-       LyXView * owner;
+       BufferView * view() const;
+
        ///
-       static int psd_idx;
+       LyXView * owner;
+
+       /// the last character added to the key sequence, in ISO encoded form
+       char encoded_last_key;
+
        ///
        kb_sequence keyseq;
        ///
@@ -85,10 +86,6 @@ private:
        void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
        void setupLocalKeymap();
-       ///
-       kb_action lyx_dead_action;
-       ///
-       kb_action lyx_calling_dead_action;
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;