Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index b495b41ced1271e7efa4a76a53eb2114939ee2bd..ef58c2bcf1ea1e7813871ae8f9e7783e56349700 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,6 +15,10 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <csignal>
 
 #include "LString.h"
@@ -23,7 +27,7 @@ class LyXGUI;
 class LyXRC;
 class LastFiles;
 class Buffer;
-
+class kb_keymap;
 
 extern string system_lyxdir;
 extern string user_lyxdir;
@@ -32,8 +36,6 @@ extern string system_tempdir;
 extern LastFiles * lastfiles; /* we should hopefully be able to move this
                              * inside the LyX class */
 
-extern LyXRC * lyxrc;
-
 
 /**
   This is the main LyX object it encapsulates most of the other objects.
@@ -68,19 +70,27 @@ private:
        bool first_start;
        ///
        string batch_command;
-       ///
-       struct sigaction act_;
+       /// 
+       // struct sigaction act_; // seems to be unused
        //@}
        /**@name Private Members */
        //@{
        ///
        void runtime();
        ///
-       void init(int * argc, char * argv[]);
+       void init(int * argc, char * argv[], bool);
+       ///
+       void defaultKeyBindings(kb_keymap * kbmap);
        ///
-       void queryUserLyXDir();
+       void deadKeyBindings(kb_keymap * kbmap);
        ///
-        void ReadRcFile(string const & name);
+       void queryUserLyXDir(bool explicit_userdir);
+       /** Search for and read the LyXRC file name, return
+           true if successfull.
+       */
+        bool ReadRcFile(string const & name);
+       /// Read the ui file `name'
+       void ReadUIFile(string const & name);
         ///
        bool easyParse(int * argc, char * argv[]);
        //@}