small changes to ButtonController usage

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 6913a51df25459db3061cf8f0fd0b679fbc21988..4aa874c6701ea4c74c212ff336c251e2b92fdd25 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,6 +6,7 @@
 #pragma interface
 #endif
 
+#include FORMS_H_LOCATION
 #include "commandtags.h"
 #include "kbsequence.h"
 #include "insets/lyxinset.h"
@@ -24,10 +25,15 @@ class LyXFunc {
 public:
        /// The status of a function.
        enum func_status {
-               OK = 0, // No problem
+               /// No problem
+               OK = 0,
+               ///
                Unknown = 1,
-               Disabled = 2, // Command cannot be executed
+               /// Command cannot be executed
+               Disabled = 2,
+               ///
                ToggleOn = 4,
+               ///
                ToggleOff = 8
        };
        ///
@@ -43,9 +49,13 @@ public:
        /// Same again but for xtl buffers.  Still looking for better idea.
        bool Dispatch(int action, auto_mem_buffer &);
 
+#if 0
        /// A keyboard event is processed to execute a lyx action. 
-       int  processKeyEvent(XEvent * ev);
-
+       int processKeyEvent(XEvent * ev);
+#else
+       ///
+       int processKeySym(KeySym k, unsigned int state);
+#endif
        ///
        func_status getStatus(int ac) const;
        
@@ -115,6 +125,7 @@ private:
 
        ///
        void doImport(string const &);
+       ///
        void doImportHelper(string const &, string const &, string const &,
                bool func(BufferView *, string const &) );
 
@@ -172,7 +183,7 @@ void LyXFunc::setHintMessage(bool hm)
        show_sc = hm;
 }
 
-
+///
 inline
 void operator|=(LyXFunc::func_status & fs, LyXFunc::func_status f)
 {