SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 91850d10c4c6fec1ad20f04aca88ab6a27499a54..669aeb364e5cad7a2a7b9d46cb822012c49d7038 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -78,6 +78,13 @@ void operator|=(LyXAlignment & la1, LyXAlignment la2) {
 }
 
 
+///
+inline
+LyXAlignment operator|(LyXAlignment la1, LyXAlignment la2) {
+       return static_cast<LyXAlignment>(static_cast<int>(la1) | static_cast<int>(la2));
+}
+
+
 /// The different LaTeX-Types
 enum LYX_LATEX_TYPES {
        ///
@@ -243,15 +250,15 @@ public:
        Font reslabelfont;
 
        /// Text that dictates how wide the left margin is on the screen
-       std::string leftmargin;
+       docstring leftmargin;
        /// Text that dictates how wide the right margin is on the screen
-       std::string rightmargin;
+       docstring rightmargin;
        /// Text that dictates how much space to leave after a potential label
-       std::string labelsep;
+       docstring labelsep;
        /// Text that dictates how much space to leave before a potential label
-       std::string labelindent;
+       docstring labelindent;
        /// Text that dictates the width of the indentation of indented pars
-       std::string parindent;
+       docstring parindent;
        ///
        double parskip;
        ///