ws changes only

[lyx.git] / src / insets / insetexternal.C

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 08f4a4f2406646d71121c93f4231aa7b53db8e1b..2fb0b6b2d44a482f5267ff06e6656edaa97f2a41 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -11,9 +11,10 @@
 #include <config.h>
 
 #include "insetexternal.h"
-#include "insets/renderers.h"
 #include "insets/ExternalSupport.h"
 #include "insets/ExternalTemplate.h"
+#include "insets/render_button.h"
+#include "insets/render_graphic.h"
 
 #include "buffer.h"
 #include "BufferView.h"
@@ -24,8 +25,10 @@
 #include "latexrunparams.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
+#include "metricsinfo.h"
 
 #include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
@@ -358,7 +361,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
 
 InsetExternal::InsetExternal()
-       : renderer_(new ButtonRenderer)
+       : renderer_(new RenderButton)
 {}
 
 
@@ -368,8 +371,8 @@ InsetExternal::InsetExternal(InsetExternal const & other)
          params_(other.params_),
          renderer_(other.renderer_->clone())
 {
-       GraphicRenderer * ptr =
-               dynamic_cast<GraphicRenderer *>(renderer_.get());
+       RenderGraphic * ptr =
+               dynamic_cast<RenderGraphic *>(renderer_.get());
        if (ptr)
                ptr->connect(boost::bind(&InsetExternal::statusChanged, this));
 }
@@ -387,9 +390,21 @@ InsetExternal::~InsetExternal()
 }
 
 
-void InsetExternal::statusChanged()
+void InsetExternal::cache(BufferView * view) const
 {
-       BufferView * const bv = renderer_->view();
+       BOOST_ASSERT(view);
+       view_ = view->owner()->view();
+}
+
+BufferView * InsetExternal::view() const
+{
+       return view_.lock().get();
+}
+
+
+void InsetExternal::statusChanged() const
+{
+       BufferView * const bv = view();
        if (bv)
                bv->updateInset(this);
 }
@@ -444,6 +459,7 @@ void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetExternal::draw(PainterInfo & pi, int x, int y) const
 {
+       cache(pi.base.bv);
        renderer_->draw(pi, x, y);
 }
 
@@ -503,20 +519,20 @@ void InsetExternal::setParams(InsetExternalParams const & p,
                               params_.display == lyx::graphics::NoDisplay);
 
        if (display_button) {
-               ButtonRenderer * button_ptr =
-                       dynamic_cast<ButtonRenderer *>(renderer_.get());
+               RenderButton * button_ptr =
+                       dynamic_cast<RenderButton *>(renderer_.get());
                if (!button_ptr) {
-                       button_ptr = new ButtonRenderer;
+                       button_ptr = new RenderButton;
                        renderer_.reset(button_ptr);
                }
 
                button_ptr->update(getScreenLabel(params_, buffer), true);
 
        } else {
-               GraphicRenderer * graphic_ptr =
-                       dynamic_cast<GraphicRenderer *>(renderer_.get());
+               RenderGraphic * graphic_ptr =
+                       dynamic_cast<RenderGraphic *>(renderer_.get());
                if (!graphic_ptr) {
-                       graphic_ptr = new GraphicRenderer;
+                       graphic_ptr = new RenderGraphic;
                        graphic_ptr->connect(
                                boost::bind(&InsetExternal::statusChanged, this));
                        renderer_.reset(graphic_ptr);