summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-18 23:47:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-18 23:47:18 -0600
commitc5e69959c9eeb6a1396f1a60d7cf4f9781a2d47c (patch)
tree32f9cb1d960e39a6df8e501aac2853b83b855b0c
parent15bb7aeb80b49c2e30ac0708a1d4b2522e9d78ce (diff)
downloadtqt3-c5e69959.tar.gz
tqt3-c5e69959.zip
Automated update from Qt3
-rw-r--r--src/kernel/ntqpaintdevice.h4
-rw-r--r--src/kernel/qpainter_x11.cpp15
2 files changed, 17 insertions, 2 deletions
diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 898f9178..68014152 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 f057e7b1..dc3e9a4c 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 );
}