--- graphics/x11drv/graphics.c
+++ graphics/x11drv/graphics.c
@@ -207,15 +207,6 @@ BOOL X11DRV_SetupGCForPen( X11DRV_PDEVIC
         val.foreground = WhitePixel( gdi_display, DefaultScreen(gdi_display) );
 	val.function = GXcopy;
 	break;
-    case R2_XORPEN :
-	val.foreground = physDev->pen.pixel;
-	/* It is very unlikely someone wants to XOR with 0 */
-	/* This fixes the rubber-drawings in paintbrush */
-	if (val.foreground == 0)
-            val.foreground = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^
-                              BlackPixel( gdi_display, DefaultScreen(gdi_display) ));
-	val.function = GXxor;
-	break;
     default :
 	val.foreground = physDev->pen.pixel;
 	val.function   = X11DRV_XROPfunction[rop2-1];
--- windows/painting.c
+++ windows/painting.c
@@ -1158,9 +1158,9 @@ BOOL WINAPI DrawFocusRect( HDC hdc, cons
     INT oldDrawMode, oldBkMode;
 
     hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
-    hNewPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_WINDOWTEXT));
+    hNewPen = CreatePen(PS_ALTERNATE, 1, RGB(255, 255, 255));
     hOldPen = SelectObject(hdc, hNewPen);
-    oldDrawMode = SetROP2(hdc, R2_XORPEN);
+    oldDrawMode = SetROP2(hdc, R2_NOT);
     oldBkMode = SetBkMode(hdc, TRANSPARENT);
 
     Rectangle(hdc, rc->left, rc->top, rc->right, rc->bottom);