From a0a719e2fe3e19dec9b8c13d94bfc4d1a5ebcb8e Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Fri, 19 Feb 1999 14:03:11 +0000
Subject: [PATCH] Fix redraw problems for ChooseColor dialog.

---
 misc/commdlg.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/misc/commdlg.c b/misc/commdlg.c
index 31c052e14ca..4b8464d87ab 100644
--- a/misc/commdlg.c
+++ b/misc/commdlg.c
@@ -2649,7 +2649,12 @@ static LRESULT CC_WMCommand(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
  */
 static LRESULT CC_WMPaint(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam) 
 {
+    HDC32 hdc;
+    PAINTSTRUCT32 ps;
     struct CCPRIVATE * lpp=(struct CCPRIVATE *)GetWindowLong32A(hDlg, DWL_USER); 
+
+    hdc=BeginPaint32(hDlg,&ps);
+    EndPaint32(hDlg,&ps);
     /* we have to paint dialog children except text and buttons */
  
     CC_PaintPredefColorArray(hDlg,6,8);
@@ -2667,7 +2672,7 @@ static LRESULT CC_WMPaint(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
     ValidateRect32(GetDlgItem32(hDlg,0x2be),NULL);
     ValidateRect32(GetDlgItem32(hDlg,0x2c5),NULL);
     /* hope we can remove it later -->FIXME */
- return 0;
+ return TRUE;
 }
 
 
@@ -2758,7 +2763,8 @@ LRESULT WINAPI ColorDlgProc(HWND16 hDlg, UINT16 message,
 	                   return TRUE;
 	                break;     
 	  case WM_PAINT:
-	                CC_WMPaint(hDlg, wParam, lParam);
+	                if (CC_WMPaint(hDlg, wParam, lParam))
+	                   return TRUE;
 	                break;
 	  case WM_LBUTTONDBLCLK:
 	                if (CC_MouseCheckResultWindow(hDlg,lParam))