Well, it turns out that we need a different return value for the xhtml

[lyx.git] / src / insets / InsetInclude.h

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index e2c3a8a2684d69534473d3aba17bf6e1e5e931e7..0e14405a8a6305abb774125c33f1cb757fe65c8e 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Richard Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
@@ -70,9 +70,9 @@ public:
         *  \param buffer the Buffer containing this inset.
         */
        support::FileNameList const &
-               getBibfilesCache(Buffer const & buffer) const;
+               getBibfilesCache() const;
        ///
-       EDITABLE editable() const { return IS_EDITABLE; }
+       bool hasSettings() const { return true; }
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
@@ -86,6 +86,8 @@ public:
        ///
        void addToToc(DocIterator const &);
        ///
+       void updateCommand();
+       ///
        void updateLabels(ParIterator const &);
        ///
        static ParamInfo const & findInfo(std::string const &);
@@ -95,6 +97,8 @@ public:
        static bool isCompatibleCommand(std::string const & s);
        ///
        docstring contextMenu(BufferView const & bv, int x, int y) const;
+       /// \return the child buffer if the file is a LyX doc and could be loaded
+       Buffer * getChildBuffer() const;
 protected:
        InsetInclude(InsetInclude const &);
        ///
@@ -109,6 +113,8 @@ private:
         */
        void fileChanged() const;
 
+       /// \return loaded Buffer or zero if the file loading did not proceed.
+       Buffer * loadIfNeeded() const;
        /// launch external application
        void editIncluded(std::string const & file);
        /// set the parameters
@@ -121,15 +127,16 @@ private:
        /// The pointer never changes although *preview_'s contents may.
        boost::scoped_ptr<RenderMonitoredPreview> const preview_;
 
+       /// 
+       mutable bool failedtoload_;
        /// cache
        mutable bool set_label_;
        mutable RenderButton button_;
        mutable docstring listings_label_;
        InsetLabel * label_;
+       mutable Buffer * child_buffer_;
 };
 
-/// return loaded Buffer or zero if the file loading did not proceed.
-Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);
 
 } // namespace lyx