compil fix for Qt-4.2

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index bc2a25ec93245f44b3af03c178910d3b31236594..ace663e1130601a5a738355481f6b0667b623ac2 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -83,8 +83,10 @@ public:
                RC_SORT_LAYOUTS,
                RC_USELASTFILEPOS,
                RC_LOADSESSION,
+               RC_MACRO_EDIT_STYLE,
                RC_MAKE_BACKUP,
                RC_MARK_FOREIGN_LANGUAGE,
+               RC_MOUSE_WHEEL_SPEED,
                RC_NUMLASTFILES,
                RC_PATH_PREFIX,
                RC_PERS_DICT,
@@ -124,7 +126,6 @@ public:
                RC_SERVERPIPE,
                RC_SET_COLOR,
                RC_SHOW_BANNER,
-               RC_SHOW_MACRO_LABEL,
                RC_SPELL_COMMAND,
                RC_TEMPDIRPATH,
                RC_TEMPLATEPATH,
@@ -253,6 +254,8 @@ public:
        /// Whether or not save/restore session information
        /// like windows position and geometry.
        bool allow_geometry_session;
+       /// Scrolling speed of the mouse wheel
+       double mouse_wheel_speed;
        /// Zoom factor for screen fonts
        unsigned int zoom;
        /// Screen font sizes in points for each font size
@@ -342,7 +345,13 @@ public:
        ///
        bool cursor_follows_scrollbar;
        ///
-       bool show_macro_label;
+       enum MacroEditStyle {
+               MACRO_EDIT_INLINE_BOX = 0,
+               MACRO_EDIT_INLINE,
+               MACRO_EDIT_LIST
+       };
+       ///
+       MacroEditStyle macro_edit_style;
        ///
        bool dialogs_iconify_with_main;
        ///