Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index ae7a8683ec6ddff0100289de6ab14654675c043f..b4948a56c720c4aac5653e87a7e8a12242e6d404 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -52,8 +52,10 @@ public:
        ///
        int processKeySym(KeySym k, unsigned int state);
 
-       ///
+       /// we need one internall which is called from inside LyXAction and
+       /// can contain the string argument.
        func_status getStatus(int ac) const;
+       func_status getStatus(int ac, string const & not_to_use_arg) const;
        
        /// The last key was meta
        bool wasMetaKey() const;
@@ -77,9 +79,8 @@ public:
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
         string const getMessage() const { return dispatch_buffer; }
-        /// Get next inset of this class from current cursor position  
-        Inset * getInsetByCode(Inset::Code);
-       
+       /// Handle a accented char keysequenze
+       void handleKeyFunc(kb_action action);
        /// Should a hint message be displayed?
        void setHintMessage(bool);
 private:
@@ -94,7 +95,7 @@ private:
        ///
        unsigned meta_fake_bit;
        ///
-       void moveCursorUpdate(bool selecting = false);
+       void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
        void setupLocalKeymap();
         ///
@@ -117,18 +118,21 @@ private:
        void MenuNew(bool fromTemplate);
 
        ///
-       void MenuOpen();
+       void Open(string const &);
 
        ///
        void doImport(string const &);
-       ///
-       void MenuInsertLyXFile(string const &);
 
        ///
        void CloseBuffer();
        ///
        void reloadBuffer();
-       /// This is the same for all lyxfunc objects
+       ///
+       //  This return or directly text (default) of getLyXText()
+       ///
+       LyXText * TEXT(bool) const;
+       ///
+       //  This is the same for all lyxfunc objects
        static bool show_sc;
 };