X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fglyphs-msw.c;h=39bb3f44c72df9986a9418f57ead2425356aa89c;hb=4f14f955e64fbf24dd2f85fc22c2976c5aad47a0;hp=4d4a5f1761878e6e4e39e169ca11b789a891d4f3;hpb=d8bd7eee3147c839d3c74d1823c139cd54867a75;p=chise%2Fxemacs-chise.git-

diff --git a/src/glyphs-msw.c b/src/glyphs-msw.c
index 4d4a5f1..39bb3f4 100644
--- a/src/glyphs-msw.c
+++ b/src/glyphs-msw.c
@@ -2326,6 +2326,24 @@ mswindows_redisplay_widget (Lisp_Image_Instance *p)
       SendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
 		   WM_SETTEXT, 0, (LPARAM)lparam);
     }
+  /* Set active state. */
+  if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p))
+    {
+      Lisp_Object item = IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p);
+      LONG style = GetWindowLong 
+	(WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
+	 GWL_STYLE);
+
+      if (CONSP (item))
+	item = XCAR (item);
+
+      if (gui_item_active_p (item))
+	SetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
+		       GWL_STYLE, style & ~WS_DISABLED);
+      else
+	SetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
+		       GWL_STYLE, style | WS_DISABLED);
+    }
 }
 
 /* register widgets into our hashtable so that we can cope with the
@@ -2601,9 +2619,10 @@ mswindows_button_instantiate (Lisp_Object image_instance, Lisp_Object instantiat
   /* This function can call lisp */
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
   HWND wnd;
-  int flags = WS_TABSTOP;/* BS_NOTIFY #### is needed to get exotic feedback
-			    only. Since we seem to want nothing beyond BN_CLICK,
-			    the style is perhaps not necessary -- kkm */
+  int flags = WS_TABSTOP | BS_NOTIFY;
+  /* BS_NOTIFY #### is needed to get exotic feedback only. Since we
+     seem to want nothing beyond BN_CLICK, the style is perhaps not
+     necessary -- kkm */
   Lisp_Object style;
   Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
   Lisp_Gui_Item* pgui = XGUI_ITEM (gui);
@@ -2934,7 +2953,7 @@ mswindows_tab_control_redisplay (Lisp_Object image_instance)
       IMAGE_INSTANCE_WIDGET_ACTION_OCCURRED (ii))
     {
       HWND wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
-      int i = 0, selected = 0;
+      int i = 0, selected_idx = 0;
       Lisp_Object rest;
 
       assert (!NILP (IMAGE_INSTANCE_WIDGET_ITEMS (ii)));
@@ -2987,10 +3006,10 @@ mswindows_tab_control_redisplay (Lisp_Object image_instance)
 	      add_tab_item (image_instance, wnd, XCAR (rest),
 			    IMAGE_INSTANCE_FRAME (ii), i);
 	      if (gui_item_selected_p (XCAR (rest)))
-		selected = i;
+		selected_idx = i;
 	      i++;
 	    }
-	  SendMessage (wnd, TCM_SETCURSEL, selected, 0);
+	  SendMessage (wnd, TCM_SETCURSEL, selected_idx, 0);
 	}
     }
 }