X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fevent-msw.c;h=d8c07f1dbaad73db345181cfcf89b21cefa10517;hp=3911ef64f8224a70047304983d2c7266f7cf8e08;hb=b5eeb6918c29470b36f8461c402eb0c65cb19bd2;hpb=755e352634f2cf331256ecc3bf7e45facab3cdc3

diff --git a/src/event-msw.c b/src/event-msw.c
index 3911ef6..d8c07f1 100644
--- a/src/event-msw.c
+++ b/src/event-msw.c
@@ -2264,9 +2264,7 @@ mswindows_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	  VOID_TO_LISP (image_instance, ii);
 	  if (IMAGE_INSTANCEP (image_instance)
 	      &&
-	      IMAGE_INSTANCE_TYPE_P (image_instance, IMAGE_WIDGET)
-	      &&
-	      !NILP (XIMAGE_INSTANCE_WIDGET_FACE (image_instance)))
+	      IMAGE_INSTANCE_TYPE_P (image_instance, IMAGE_WIDGET))
 	    {
 	      /* set colors for the buttons */
 	      HDC hdc = (HDC)wParam;
@@ -3004,7 +3002,7 @@ vars_of_event_mswindows (void)
   mswindows_s_dispatch_event_queue = Qnil;
   staticpro (&mswindows_s_dispatch_event_queue);
   mswindows_s_dispatch_event_queue_tail = Qnil;
-  pdump_wire (&mswindows_u_dispatch_event_queue_tail);
+  pdump_wire (&mswindows_s_dispatch_event_queue_tail);
 
   mswindows_error_caught_in_modal_loop = Qnil;
   staticpro (&mswindows_error_caught_in_modal_loop);