Minimal fix needed to give Qt a label dialog again.

[lyx.git] / src / lyxlayout.h

diff --git a/src/lyxlayout.h b/src/lyxlayout.h
index ff6d1446f55c96c0264aa3fbceee544f5601792a..1aafb4a11476ecbbe641f1d60faced8ab5b493c8 100644 (file)
--- a/src/lyxlayout.h
+++ b/src/lyxlayout.h
@@ -12,10 +12,6 @@
 #ifndef LYX_LAYOUT_H
 #define LYX_LAYOUT_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxfont.h"
 #include "layout.h"
 #include "Spacing.h"
@@ -52,6 +48,8 @@ public:
        ///
        string const & obsoleted_by() const;
        ///
+       string const & depends_on() const;
+       ///
        string const & latexname() const { return latexname_; }
        ///
        string const & labelstring() const { return labelstring_; }
@@ -179,6 +177,7 @@ public:
        ///
        bool isEnvironment() const {
                return (latextype == LATEX_ENVIRONMENT
+                       || latextype == LATEX_BIB_ENVIRONMENT
                        || latextype == LATEX_ITEM_ENVIRONMENT
                        || latextype == LATEX_LIST_ENVIRONMENT);
        }
@@ -186,6 +185,9 @@ public:
        LYX_LATEX_TYPES latextype;
        /// Does this object belong in the title part of the document?
        bool intitle;
+       /// Does this layout allow for an optional parameter?
+       int optionalargs;
+
 private:
        /// Name of the layout/paragraph environment
        string name_;
@@ -196,6 +198,12 @@ private:
        */
        string obsoleted_by_;
 
+       /** Name of an layout which preamble must come before this one
+           This is used when the preamble snippet uses macros defined in
+           another preamble
+        */
+       string depends_on_;
+
        /// LaTeX name for environment
        string latexname_;