Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 228d3130d75c7977ce3518dfd22dd927aad76447..1313484f62bd8a4c37f5f30991b04459f011dd6c 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -23,7 +23,7 @@ namespace lyx {
 class InsetFloatParams {
 public:
        ///
-       InsetFloatParams() : wide(false), sideways(false) {}
+       InsetFloatParams() : wide(false), sideways(false), subfloat(false) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -36,6 +36,8 @@ public:
        bool wide;
        ///
        bool sideways;
+       ///
+       bool subfloat;
 };
 
 
@@ -45,32 +47,27 @@ public:
 class InsetFloat : public InsetCollapsable {
 public:
        ///
-       InsetFloat(BufferParams const &, std::string const &);
+       InsetFloat(Buffer const &, std::string const &);
        ///
        ~InsetFloat();
        ///
        docstring name() const { return name_; }
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       void read(Buffer const & buf, Lexer & lex);
+       void read(Lexer & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
        InsetCode lyxCode() const { return FLOAT_CODE; }
        ///
-       bool isMacroScope(Buffer const & buf) const { return true; }
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
-       ///
-       virtual docstring const editMessage() const;
+       docstring editMessage() const;
        ///
        bool insetAllowed(InsetCode) const;
        /** returns true if, when outputing LaTeX, font changes should
@@ -82,18 +79,22 @@ public:
        ///
        void sideways(bool s, BufferParams const &);
        ///
-       bool  showInsetDialog(BufferView *) const;
+       void subfloat(bool s, BufferParams const &);
+       ///
+       bool showInsetDialog(BufferView *) const;
        ///
        InsetFloatParams const & params() const { return params_; }
+private:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       virtual void updateLabels(Buffer const &, ParIterator const &);
-protected:
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-private:
+       void updateLabels(ParIterator const &);
+       ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       Inset * clone() const { return new InsetFloat(*this); }
        ///
-       virtual Inset * clone() const;
+       docstring getCaption(OutputParams const &) const;
        ///
        InsetFloatParams params_;
        ///