small changes to ButtonController usage

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index fcb825489f10e972502701a46b26a1397f230210..4aa874c6701ea4c74c212ff336c251e2b92fdd25 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,12 +6,14 @@
 #pragma interface
 #endif
 
+#include FORMS_H_LOCATION
 #include "commandtags.h"
 #include "kbsequence.h"
 #include "insets/lyxinset.h"
 #include "LString.h"
 
 class LyXView;
+class auto_mem_buffer;
 
 /** This class encapsulates all the LyX command operations. 
     This is the class of the LyX's "high level event handler".
@@ -23,24 +25,37 @@ 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
        };
        ///
+       explicit
        LyXFunc(LyXView *);
     
-       /// LyX distpatcher, executes lyx actions.
+       /// LyX dispatcher, executes lyx actions.
        string Dispatch(int action, char const * arg = 0);
                         
        /// The same but uses the name of a lyx command.
        string Dispatch(string const & cmd);
 
-       /// A keyboard event is processed to execute a lyx action. 
-       int  processKeyEvent(XEvent * ev);
+       /// 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);
+#else
+       ///
+       int processKeySym(KeySym k, unsigned int state);
+#endif
        ///
        func_status getStatus(int ac) const;
        
@@ -109,13 +124,10 @@ private:
        void MenuOpen();
 
        ///
-       void doImportLaTeX(bool);
-
-       ///
-       void doImportASCII(bool);
-
+       void doImport(string const &);
        ///
-       void doImportLinuxDoc();
+       void doImportHelper(string const &, string const &, string const &,
+               bool func(BufferView *, string const &) );
 
        ///
        void MenuInsertLyXFile(string const &);
@@ -171,7 +183,7 @@ void LyXFunc::setHintMessage(bool hm)
        show_sc = hm;
 }
 
-
+///
 inline
 void operator|=(LyXFunc::func_status & fs, LyXFunc::func_status f)
 {