diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-07-12 08:06:22 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-07-12 08:06:22 +0000 |
| commit | a10c4e76712eb7f93bb0b240c5bac463af9e8124 (patch) | |
| tree | bf3db16367b9c52b1d65ff5041d571bfba0b9091 /navit/graphics/qt_qpainter | |
| parent | b8c557176f4014c9544aa837e81166c2e55fd9c5 (diff) | |
| download | navit-a10c4e76712eb7f93bb0b240c5bac463af9e8124.tar.gz | |
Fix:graphics_qt_qpainter:Restored accidentialy undone functionality
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3492 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/graphics/qt_qpainter')
| -rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 3c2d7fcfd..621196362 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -106,6 +106,10 @@ #include <QX11EmbedWidget> #endif +#ifndef QT_QPAINTER_RENDERAREA_PARENT +#define QT_QPAINTER_RENDERAREA_PARENT QWidget +#endif + class RenderArea; //############################################################################################################## @@ -153,11 +157,11 @@ struct graphics_priv { //# Comment: //# Authors: Martin Schaller (04/2008), Stefan Klumpp (04/2008) //############################################################################################################## -class RenderArea : public QWidget +class RenderArea : public QT_QPAINTER_RENDERAREA_PARENT { Q_OBJECT public: - RenderArea(struct graphics_priv *priv, QWidget *parent = 0, int w=800, int h=800, int overlay=0); + RenderArea(struct graphics_priv *priv, QT_QPAINTER_RENDERAREA_PARENT *parent = 0, int w=800, int h=800, int overlay=0); void do_resize(QSize size); QPixmap *pixmap; struct callback_list *cbl; @@ -281,8 +285,8 @@ qt_qpainter_draw(struct graphics_priv *gr, const QRect *r, int paintev) //# Comment: Using a QPixmap for rendering the graphics //# Authors: Martin Schaller (04/2008) //############################################################################################################## -RenderArea::RenderArea(struct graphics_priv *priv, QWidget *parent, int w, int h, int overlay) - : QWidget(parent) +RenderArea::RenderArea(struct graphics_priv *priv, QT_QPAINTER_RENDERAREA_PARENT *parent, int w, int h, int overlay) + : QT_QPAINTER_RENDERAREA_PARENT(parent) { pixmap = new QPixmap(w, h); #ifndef QT_QPAINTER_NO_WIDGET @@ -1173,7 +1177,9 @@ static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graph ret->parent=gr; ret->next=gr->overlays; gr->overlays=ret; +#ifndef QT_QPAINTER_NO_WIDGET ret->widget->hide(); +#endif return ret; } |