prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index db6a01a29f19502e20fa45333fb9773bc46519d9..b91cd04c6ce56d06a06b2b31f99f4c5d91eac067 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -15,21 +15,22 @@
 
 #include "inset.h"
 #include "insetgraphicsParams.h"
-#include "dimension.h"
 
-#include <boost/signals/trackable.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signals/trackable.hpp>
+
 
 class Dialogs;
+class GraphicRenderer;
 class LaTeXFeatures;
 
 ///
-class InsetGraphics : public Inset, public boost::signals::trackable {
+class InsetGraphics : public InsetOld, public boost::signals::trackable {
 public:
        ///
        InsetGraphics();
        ///
-       InsetGraphics(InsetGraphics const &, string const & filepath);
+       InsetGraphics(InsetGraphics const &);
        ///
        ~InsetGraphics();
        ///
@@ -64,37 +65,30 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::GRAPHICS_CODE; }
 
        ///
-       virtual Inset * clone(Buffer const &) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
        */
-       bool setParams(InsetGraphicsParams const & params,
-                      string const & filepath);
+       bool setParams(InsetGraphicsParams const & params);
 
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
 
 private:
-       /// Returns the cached BufferView.
-       BufferView * view() const;
-
        ///
        friend class InsetGraphicsMailer;
 
-       /// Is the image ready to draw, or should we display a message instead?
-       bool imageIsDrawable() const;
-
-       /** This method is connected to cache_->statusChanged, so we are
-           informed when the image has been loaded.
+       /** This method is connected to the graphics loader, so we are
+        *  informed when the image has been loaded.
         */
        void statusChanged();
 
        /// Read the inset native format
-       void readInsetGraphics(LyXLex & lex);
+       void readInsetGraphics(LyXLex & lex, string const & bufpath);
 
        /// Get the status message, depends on the image loading status.
        string const statusMessage() const;
@@ -109,13 +103,8 @@ private:
        /// holds the entity name that defines the graphics location (SGML).
        string const graphic_label;
 
-       /// The cached variables
-       class Cache;
-       friend class Cache;
-       /// The pointer never changes although *cache_'s contents may.
-       boost::scoped_ptr<Cache> const cache_;
-       /// dimension cache
-       mutable Dimension dim_;
+       /// The thing that actually draws the image on LyX's screen.
+       boost::scoped_ptr<GraphicRenderer> const graphic_;
 };
 
 
@@ -130,11 +119,14 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetGraphicsParams &);
+       static void string2params(string const & data,
+                                 Buffer const & buffer,
+                                 InsetGraphicsParams &);
        ///
-       static string const params2string(InsetGraphicsParams const &);
+       static string const params2string(InsetGraphicsParams const &,
+                                         Buffer const &);
 private:
        ///
        static string const name_;