X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.h;h=19a403b56dd2a83aa7010055a8614fae3098c6f0;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=3d3aab4cfd6b4a51c02fb6b4dbb6dca24718070b;hpb=808973619b70166c140acfd12467ddc84ed6a848;p=lyx.git

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 3d3aab4cfd..19a403b56d 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -2,14 +2,9 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
 #include "FuncStatus.h"
 #include "kbsequence.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "LString.h"
 
 #include <boost/signals/trackable.hpp>
@@ -37,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);
 
@@ -77,8 +72,10 @@ private:
 
 	///
 	LyXView * owner;
-	///
-	static int psd_idx;
+
+	/// the last character added to the key sequence, in ISO encoded form
+	char encoded_last_key;
+
 	///
 	kb_sequence keyseq;
 	///
@@ -86,13 +83,9 @@ private:
 	///
 	key_modifier::state meta_fake_bit;
 	///
-	void moveCursorUpdate(bool flag = true, bool selecting = false);
+	void moveCursorUpdate();
 	///
 	void setupLocalKeymap();
-	///
-	kb_action lyx_dead_action;
-	///
-	kb_action lyx_calling_dead_action;
 	/// Error status, only Dispatch can change this flag
 	mutable bool errorstat;
 
@@ -120,23 +113,6 @@ private:
 
 	///
 	void closeBuffer();
-	///
-	void reloadBuffer();
-	///
-	//  This return or directly text (default) of getLyXText()
-	///
-	LyXText * TEXT(bool) const;
-	///
 };
 
-
-/*--------------------  inlines  --------------------------*/
-
-inline
-bool LyXFunc::wasMetaKey() const
-{
-	return (meta_fake_bit != key_modifier::none);
-}
-
-
 #endif