diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 15:27:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 17:02:53 +0000 |
| commit | 639aa8e72639fd01e9004977f1cfaafc13b1e45f (patch) | |
| tree | 0c823511176bc3913ef04cb4edb1fe0cb0270c12 /include/cppcanvas | |
| parent | 3c10c9ec665a218ff331994ea3fa35cf2f4cd60e (diff) | |
Resolves: fdo#71527 make presenter console not crash/useless
Basically reverts the pieces of
21ec9beae29b19b8ec6f0a16fd0e708e4f210208 to make XSpriteCanvas a
XBitmapCanvas again
Otherwise PresenterHelper::loadBitmap is not an XBitmapCanvas
and so VclFactory::createBitmap cannot succeed
Change-Id: I197adf98e915102f383ee050a8ea16d1e41cecf2
Diffstat (limited to 'include/cppcanvas')
| -rw-r--r-- | include/cppcanvas/spritecanvas.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index 91fc52b3cc41..d5e6a27d65db 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -28,7 +28,7 @@ #include <boost/shared_ptr.hpp> -#include <cppcanvas/canvas.hxx> +#include <cppcanvas/bitmapcanvas.hxx> #include <cppcanvas/sprite.hxx> #include <cppcanvas/customsprite.hxx> @@ -49,7 +49,7 @@ namespace cppcanvas /** SpriteCanvas interface */ - class SpriteCanvas : public virtual Canvas, private boost::noncopyable + class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable { public: virtual bool updateScreen( bool bUpdateAll ) const = 0; |