Update from qt3

3 files changed, 15 insertions, 5 deletions

diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 8e49c580c..acff7a968 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -768,6 +768,7 @@ public:
 	DotLine,
 	DashDotLine,
 	DashDotDotLine,
+        FineDotLine,
 	MPenStyle = 0x0f
     };
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 79960a4ec..e3841b4d4 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -414,6 +414,8 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
 
     \value DashDotDotLine  one dash, two dots, one dash, two dots.
 
+    \value FineDotLine  single pixel dots separated by single pixels.
+
     \value MPenStyle mask of the pen styles.
 
     \img pen-styles.png Pen Styles
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index a35b5b3b8..0be2db0a5 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -786,6 +786,13 @@ void TQPainter::updatePen()
 	dashes[5] = dot;
 	dash_len = 6;
 	allow_zero_lw = FALSE;
+	break;
+    case FineDotLine:
+	dot = 1;
+	dashes[0] = dot;
+	dashes[1] = dot;
+	dash_len = 2;
+	allow_zero_lw = FALSE;
     }
     Q_ASSERT( dash_len <= (int) sizeof(dashes) );
 
@@ -1836,21 +1843,21 @@ void TQPainter::drawWinFocusRect( int x, int y, int w, int h,
 
     if ( xorPaint ) {
         if ( TQColor::numBitPlanes() <= 8 )
-            setPen( color1 );
+            setPen( TQPen(color1, 0, TQt::FineDotLine) );
         else
-            setPen( white );
+            setPen( TQPen(white, 0, TQt::FineDotLine) );
         setRasterOp( XorROP );
     } else {
         if ( tqGray( bgColor.rgb() ) < 128 )
-            setPen( white );
+            setPen( TQPen(white, 0, TQt::FineDotLine) );
         else
-            setPen( black );
+            setPen( TQPen(black, 0, TQt::FineDotLine) );
     }
 
     if ( testf(ExtDev|VxF|WxF) ) {
         if ( testf(ExtDev) ) {
             TQPDevCmdParam param[1];
-            TQRect r( x, y, w, h );
+            TQRect r( x, y, w-1, h-1 );
             param[0].rect = &r;
             if ( !pdev->cmd( TQPaintDevice::PdcDrawRect, this, param ) || !hd) {
                 setRasterOp( old_rop );