diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-19 07:26:33 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-19 07:26:33 -0600 |
| commit | 74ce99a42a0dc9d9a168156a2f5d146edb9bb555 (patch) | |
| tree | 327d8b290dea29cb3876e30e1204cd4ba398a0af | |
| parent | dd5f392d9ffcea1c9246d0a3929bd86b86b6deba (diff) | |
| parent | c5e69959c9eeb6a1396f1a60d7cf4f9781a2d47c (diff) | |
| download | tqt3-74ce99a42a0dc9d9a168156a2f5d146edb9bb555.tar.gz tqt3-74ce99a42a0dc9d9a168156a2f5d146edb9bb555.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
| -rw-r--r-- | src/kernel/ntqpaintdevice.h | 4 | ||||
| -rw-r--r-- | src/kernel/qpainter_x11.cpp | 15 | ||||
| -rw-r--r-- | tools/assistant/lib/ntqassistantclient.h | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h index 898f91787..68014152b 100644 --- a/src/kernel/ntqpaintdevice.h +++ b/src/kernel/ntqpaintdevice.h @@ -204,7 +204,9 @@ public: PdcSaveWMatrix = 56, PdcRestoreWMatrix = 57, PdcSetClip = 60, // ival - PdcSetClipRegion = 61, // rgn + PdcSetClipRegion = 61, // rgn,cmode + PdcFlush = 62, // <void> + PdcFlushRegion = 63, // rgn,cmode PdcReservedStart = 0, // codes 0-199 are reserved PdcReservedStop = 199 // for TQt diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index f057e7b1f..dc3e9a4ce 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -1264,8 +1264,16 @@ bool TQPainter::end() // end painting \sa flush() CoordinateMode */ -void TQPainter::flush(const TQRegion &, CoordinateMode) +void TQPainter::flush(const TQRegion &rgn, CoordinateMode m) { + if ( testf(ExtDev) ) { + TQPDevCmdParam param[2]; + param[0].rgn = &rgn; + param[1].ival = m; + pdev->cmd( TQPaintDevice::PdcFlushRegion, this, param ); + return; + } + flush(); } @@ -1278,6 +1286,11 @@ void TQPainter::flush(const TQRegion &, CoordinateMode) void TQPainter::flush() { + if ( testf(ExtDev) ) { + pdev->cmd( TQPaintDevice::PdcFlush, this, 0 ); + return; + } + if ( isActive() && dpy ) XFlush( dpy ); } diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h index fc309cf29..c2eefbecd 100644 --- a/tools/assistant/lib/ntqassistantclient.h +++ b/tools/assistant/lib/ntqassistantclient.h @@ -39,7 +39,7 @@ class TQSocket; class TQProcess; -class TQAssistantClient : public TQObject +class Q_EXPORT TQAssistantClient : public TQObject { TQ_OBJECT TQ_PROPERTY( bool open READ isOpen ) |