X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglyphs-x.c;h=ae7d3be55fdb53edd14670df26d751a77e5712da;hb=21db8709c0c2dcedbd278c7fe571290d5ce80a71;hp=f37d3baec0a8b4192625598d77ab791bf4c75b85;hpb=571a24e2bfea15d37c3503414674f59e89ec9652;p=chise%2Fxemacs-chise.git

diff --git a/src/glyphs-x.c b/src/glyphs-x.c
index f37d3ba..ae7d3be 100644
--- a/src/glyphs-x.c
+++ b/src/glyphs-x.c
@@ -703,7 +703,7 @@ write_lisp_string_to_temp_file (Lisp_Object string, char *filename_out)
   /* Get the data while doing the conversion */
   while (1)
     {
-      ssize_t size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
+      Lstream_data_count size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
       if (!size_in_bytes)
 	break;
       /* It does seem the flushes are necessary... */
@@ -798,7 +798,7 @@ generate_cursor_fg_bg (Lisp_Object device, Lisp_Object *foreground,
   else
     {
       xbg->pixel = 0;
-      xbg->red = xbg->green = xbg->blue = ~0;
+      xbg->red = xbg->green = xbg->blue = USHRT_MAX;
     }
 }
 
@@ -2778,7 +2778,7 @@ x_tab_control_redisplay (Lisp_Object image_instance)
 		     but I couldn't find it. */
 		  Lisp_Object old_selected =gui_item_list_find_selected
 		    (XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)));
-		  Arg al [1];
+		  Arg al [2];
 		  char* name;
 		  unsigned int num_children, i;
 		  Widget* children;
@@ -2794,7 +2794,9 @@ x_tab_control_redisplay (Lisp_Object image_instance)
 		      if (!strcmp (XtName (children [i]), name))
 			{
 			  XtSetArg (al [0], XtNtopWidget, children [i]);
-			  XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 1);
+			  XtSetArg (al [1], XtNhighlightWidget,
+				    children [i]);
+			  XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 2);
 			  break;
 			}
 		    }