X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=a9342cce87565326f537bae97ee8789f4f607b45;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=ca8008c65eede0baa308408834167d25e6ebf6bc;hpb=e4a5278060ea2571df0ae18c649c02f5ed8431b7;p=lyx.git diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp index ca8008c65e..a9342cce87 100644 --- a/src/insets/RenderGraphic.cpp +++ b/src/insets/RenderGraphic.cpp @@ -14,9 +14,6 @@ #include "insets/Inset.h" -#include "support/FileName.h" -#include "support/filetools.h" -#include "support/gettext.h" #include "LyX.h" #include "LyXRC.h" #include "MetricsInfo.h" @@ -26,9 +23,11 @@ #include "graphics/GraphicsImage.h" +#include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" -#include +#include "support/bind.h" using namespace std; @@ -37,14 +36,14 @@ namespace lyx { RenderGraphic::RenderGraphic(Inset const * inset) { - loader_.connect(boost::bind(&Inset::updateFrontend, inset)); + loader_.connect(bind(&Inset::updateFrontend, inset)); } RenderGraphic::RenderGraphic(RenderGraphic const & other, Inset const * inset) : RenderBase(other), loader_(other.loader_), params_(other.params_) { - loader_.connect(boost::bind(&Inset::updateFrontend, inset)); + loader_.connect(bind(&Inset::updateFrontend, inset)); } @@ -53,6 +52,10 @@ RenderBase * RenderGraphic::clone(Inset const * inset) const return new RenderGraphic(*this, inset); } +void RenderGraphic::reload() const +{ + loader_.reload(); +} void RenderGraphic::update(graphics::Params const & params) { @@ -67,8 +70,7 @@ namespace { bool displayGraphic(graphics::Params const & params) { - return params.display != graphics::NoDisplay && - lyxrc.display_graphics != graphics::NoDisplay; + return params.display && lyxrc.display_graphics; }