summaryrefslogtreecommitdiffstats
path: root/src/kernel/qpainter_x11.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-09-14 17:50:55 -0500
committerDarrell Anderson <[email protected]>2012-09-14 17:50:55 -0500
commit9ea2e3d89314dd9a8494e33c4d435184aedce711 (patch)
treeef507816e1e3f0944dffb197c6a9c7da8a838fbc /src/kernel/qpainter_x11.cpp
parent778e6b59651897a35d65e17cdd80bb7f398e8aa2 (diff)
parent4623775a226d3d21dac6fee77fcaa9bfa477e6b8 (diff)
downloadtqt3-9ea2e3d89314dd9a8494e33c4d435184aedce711.tar.gz
tqt3-9ea2e3d89314dd9a8494e33c4d435184aedce711.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qpainter_x11.cpp')
-rw-r--r--src/kernel/qpainter_x11.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 0be2db0a5..f057e7b1f 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -1839,7 +1839,8 @@ void TQPainter::drawWinFocusRect( int x, int y, int w, int h,
static char winfocus_line[] = { 1, 1 };
TQPen old_pen = cpen;
- RasterOp old_rop = (RasterOp)rop;
+ TQBrush old_brush = cbrush;
+ RasterOp old_rop = (RasterOp)rop;
if ( xorPaint ) {
if ( TQColor::numBitPlanes() <= 8 )
@@ -1858,10 +1859,13 @@ void TQPainter::drawWinFocusRect( int x, int y, int w, int h,
if ( testf(ExtDev) ) {
TQPDevCmdParam param[1];
TQRect r( x, y, w-1, h-1 );
+ TQBrush noBrush;
+ setBrush( noBrush );
param[0].rect = &r;
if ( !pdev->cmd( TQPaintDevice::PdcDrawRect, this, param ) || !hd) {
setRasterOp( old_rop );
setPen( old_pen );
+ setBrush( old_brush );
return;
}
}