Fixed inset-text border redraw problem and hopefully recalc boostup.

[lyx.git] / src / graphics / Renderer.C

diff --git a/src/graphics/Renderer.C b/src/graphics/Renderer.C
index 405f5a1d158fec3b264bad42565fecf38bb92503..91758ea35e51eae3c94276eb924641fad6e50b2d 100644 (file)
--- a/src/graphics/Renderer.C
+++ b/src/graphics/Renderer.C
@@ -19,6 +19,7 @@
 #include FORMS_H_LOCATION
 #include "support/filetools.h"
 
+#include "frontends/support/LyXImage.h"
 
 Renderer::Renderer()
        : width_(0), height_(0), pixmapLoaded_(false)
@@ -55,7 +56,7 @@ bool Renderer::isImageFormatOK(string const & /*filename*/) const
        return false;
 }
 
-void Renderer::setPixmap(Pixmap pixmap, unsigned int width, unsigned int height)
+void Renderer::setPixmap(LyXImage * pixmap, unsigned int width, unsigned int height)
 {
        freePixmap();
 
@@ -65,20 +66,26 @@ void Renderer::setPixmap(Pixmap pixmap, unsigned int width, unsigned int height)
        pixmapLoaded_ = true;
 }
 
-Pixmap Renderer::getPixmap() const
-{ return pixmap_; }
+LyXImage * Renderer::getPixmap() const
+{
+       return pixmap_;
+}
 
 unsigned int Renderer::getWidth() const
 { return width_; }
 
 unsigned int Renderer::getHeight() const
-{ return height_; }
+{
+       return height_;
+}
 
 string const & Renderer::getFilename() const
-{ return filename_; }
+{
+       return filename_;
+}
 
 void Renderer::freePixmap()
 {
        if (pixmapLoaded_)
-               XFreePixmap(fl_display, pixmap_);
+               XFreePixmap(fl_get_display(), pixmap_->getPixmap());
 }