(defined_color): Map color to nearest in default palette.

(win32_wnd_proc): Special handling for WM_CLOSE.

diff --git a/src/w32fns.c b/src/w32fns.c
index b321f92fe454d65d9bfe3b29ba9cb9877611fb83..38f09bbf852b9b7018ef5d919274c8fba252aebf 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1185,7 +1185,9 @@ defined_color (f, color, color_def, alloc)
 
   if (!NILP (tem)) 
     {
-      *color_def = XUINT (tem);
+      /* map color to nearest in (default) palette, to avoid
+        dithering on limited color displays. */
+      *color_def = XUINT (tem) | 0x2000000;
       return 1;
     } 
   else 
@@ -2777,12 +2779,16 @@ win32_wnd_proc (hwnd, msg, wParam, lParam)
     case WM_MOVE:
     case WM_SIZE:
     case WM_KILLFOCUS:
-    case WM_CLOSE:
     case WM_VSCROLL:
     case WM_SYSCOMMAND:
     case WM_COMMAND:
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
       goto dflt;
+
+    case WM_CLOSE:
+      my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+      return 0;
+
     case WM_WINDOWPOSCHANGING:
       {
        WINDOWPLACEMENT wp;