Fix for bug #904: 'no decorations'

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7991 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 17, 2008 · bbe6908 · bbe6908
1 parent 29d77c0
commit bbe6908
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -368,7 +368,7 @@ void QgsMapCanvas::refresh()
 
     // notify any listeners that rendering is complete
     QPainter p;
-    p.begin(&mMap->pixmap());
+    p.begin(&mMap->paintDevice());
     emit renderComplete(&p);
     p.end();
 

diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp
@@ -100,3 +100,15 @@ void QgsMapCanvasMap::render()
   }
   update();
 }
+
+QPaintDevice& QgsMapCanvasMap::paintDevice()
+{
+  if (mUseQImageToRender)
+    {
+      return mImage;
+    }
+  else
+    {
+      return mPixmap;
+    }
+}
diff --git a/src/gui/qgsmapcanvasmap.h b/src/gui/qgsmapcanvasmap.h
@@ -45,7 +45,11 @@ class GUI_EXPORT QgsMapCanvasMap : public QGraphicsRectItem
 
     void setPanningOffset(const QPoint& point);
 
+    //deprecated. Please use paintDevice() function
+    //which is also save in case QImage is used
     QPixmap& pixmap() { return mPixmap; }
+
+    QPaintDevice& paintDevice();
 
     void paint(QPainter* p, const QStyleOptionGraphicsItem*, QWidget*);