Small fix.

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index ede04f705552e83bab5df1e93f89372d91dbd4ea..4844a92efe601b909f5c2e2c50a20d382a39ea59 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,9 +16,6 @@
 #pragma interface
 #endif
 
-#include <map>
-
-#include "ToolbarDefaults.h"
 #include "bufferparams.h"
 
 /// This contains the runtime configuration of LyX
@@ -40,7 +37,9 @@ public:
        ///
        int ReadBindFile(string const & name = "cua");
        ///
-       ToolbarDefaults toolbardefaults;
+       string bind_file;
+       ///
+       string ui_file;
        ///
        string printer;
        ///
@@ -140,12 +139,16 @@ public:
        string backupdir_path;
        /// Zoom factor for screen fonts
        unsigned int zoom;
+       /// parameter for button_4 and button_5 (scrollwheel)
+       unsigned int wheel_jump;
        /// Screen font sizes in points for each font size
        float font_sizes[10];
        /// Allow the use of scalable fonts? Default is yes.
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
+       /// Whether lyx should handle deadkeys by itself
+       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -160,6 +163,14 @@ public:
        string popup_font_name;
        ///
        string font_norm;
+       enum FontEncoding {
+               ISO_10646_1,
+               ISO_8859_6_8,
+               OTHER_ENCODING
+       };
+       FontEncoding font_norm_type;
+       ///
+       void set_font_norm_type();
        ///
        string font_norm_menu;
        ///
@@ -221,6 +232,8 @@ public:
        ///
        bool auto_number;
        ///
+       bool mark_foreign_language;
+       ///
        bool show_banner;
        /// Do we have to use a GUI?
        bool use_gui;
@@ -236,13 +249,6 @@ public:
        string docbook_to_html_command;
        ///
        string docbook_to_pdf_command;
-       ///
-       typedef std::map<string, int> Bindings;
-       ///
-       Bindings bindings;
-private:
-       ///
-       void defaultKeyBindings();
 };
 
 extern LyXRC lyxrc;