* gcc does not like missing characters in keywords

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 13a348162543fca6f25081155a837d649c8f6861..b9d7e5c6d489d22e447a6142ee76a9fe110638cb 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -19,7 +19,6 @@
 #define LYXRC_H
 
 #include "paper.h"
-#include "graphics/GraphicsTypes.h"
 
 #include <iosfwd>
 #include <string>
@@ -32,9 +31,7 @@ namespace support { class FileName; }
 class Lexer;
 
 /// This contains the runtime configuration of LyX
-class LyXRC //: public noncopyable
-// after 1.1.6 I will use a LyXRCStruct here and then this can be made
-// noncopyable again.  For now I want to minimise changes.  ARRae 20001010
+class LyXRC
 {
 public:
        enum LyXRCTags {
@@ -58,6 +55,7 @@ public:
                RC_CUSTOM_EXPORT_COMMAND,
                RC_CUSTOM_EXPORT_FORMAT,
                RC_DATE_INSERT_FORMAT,
+               RC_DEFFILE,
                RC_DEFAULT_LANGUAGE,
                RC_DEFAULT_PAPERSIZE,
                RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -160,9 +158,10 @@ public:
        ///
        void write(support::FileName const & filename,
                   bool ignore_system_lyxrc) const;
-       ///
+       /// write rc. If a specific tag is given, only output that one.
        void write(std::ostream & os,
-                  bool ignore_system_lyxrc) const;
+                  bool ignore_system_lyxrc, 
+                  std::string const & tag = std::string()) const;
        ///
        void print() const;
        // FIXME unused (was used for xforms. Do we still need this?)
@@ -170,6 +169,8 @@ public:
        ///
        std::string bind_file;
        ///
+       std::string def_file;
+       ///
        std::string ui_file;
        ///
        std::string printer;
@@ -338,7 +339,8 @@ public:
        ///
        int label_init_length;
        ///
-       graphics::DisplayType display_graphics;
+       ///graphics::DisplayType
+       int display_graphics;
        ///
        bool show_banner;
        ///
@@ -380,7 +382,7 @@ class LyXRC_PreviewStatus {
        LyXRC::PreviewStatus val_;
 public:
        LyXRC_PreviewStatus(LyXRC::PreviewStatus val) : val_(val) {}
-       operator LyXRC::PreviewStatus() const{ return val_; }
+       operator LyXRC::PreviewStatus() const { return val_; }
 };