X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Ftoolbar-msw.c;h=8d6389b59be747eb20683b430884460f121284f2;hp=b9fa9591e8e6a4f01c7aa376d3b40612263badef;hb=113b194be934327de99a168d809271db252c07c4;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910

diff --git a/src/toolbar-msw.c b/src/toolbar-msw.c
index b9fa959..8d6389b 100644
--- a/src/toolbar-msw.c
+++ b/src/toolbar-msw.c
@@ -87,7 +87,7 @@ allocate_toolbar_item_id (struct frame* f, struct toolbar_button* button,
   /* hmm what do we generate an id based on */
   int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0));
   while (!NILP (Fgethash (make_int (id),
-			  FRAME_MSWINDOWS_TOOLBAR_HASHTABLE (f), Qnil)))
+			  FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil)))
     {
       id = TOOLBAR_ITEM_ID_BITS (id + 1);
     }
@@ -105,14 +105,14 @@ mswindows_clear_toolbar (struct frame *f, enum toolbar_pos pos,
     {
       TBBUTTON info;
       
-      /* delete the buttons and remove the command from the hashtable*/
+      /* Delete the buttons and remove the command from the hash table*/
       i = SendMessage (toolbarwnd, TB_BUTTONCOUNT, 0, 0);
       for (i--; i >= 0; i--)
 	{
 	  SendMessage (toolbarwnd, TB_GETBUTTON, (WPARAM)i, 
 		       (LPARAM)&info);
 	  Fremhash(make_int(info.idCommand), 
-		   FRAME_MSWINDOWS_TOOLBAR_HASHTABLE(f));
+		   FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f));
 	  SendMessage (toolbarwnd, TB_DELETEBUTTON, (WPARAM)i, 0);
 	}
 	  
@@ -205,10 +205,11 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
     {
 
       struct toolbar_button *tb = XTOOLBAR_BUTTON (button);
-      checksum = HASH4 (checksum, 
+      checksum = HASH5 (checksum, 
 			internal_hash (get_toolbar_button_glyph(w, tb), 0),
 			internal_hash (tb->callback, 0),
-			width);
+			width,
+			LISP_HASH (w->toolbar_buttons_captioned_p));
       button = tb->next;
       nbuttons++;
     }
@@ -262,7 +263,7 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
 		  
 		  if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p))
 		    {
-		      /* we are going to honour the toolbar settings
+		      /* we are going to honor the toolbar settings
 			 and resize the bitmaps accordingly if they are
 			 too big.  If they are too small we leave them
 			 and pad the difference - unless a different size
@@ -293,7 +294,7 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
 			    {
 			      xfree (button_tbl);
 			      if (ilist) ImageList_Destroy (ilist);
-			      signal_simple_error ("couldn't resize pixmap", 
+			      signal_simple_error ("Couldn't resize pixmap", 
 						   instance);
 			    }
 			  /* we don't care if the mask fails */
@@ -316,7 +317,7 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
 					nbuttons, nbuttons * 2 )))
 			{
 			  xfree (button_tbl);
-			  signal_simple_error ("couldn't create image list",
+			  signal_simple_error ("Couldn't create image list",
 					       instance);
 			}
 
@@ -343,7 +344,7 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
 		}
 
 	      Fputhash (make_int (tbbutton->idCommand), 
-			button, FRAME_MSWINDOWS_TOOLBAR_HASHTABLE (f));
+			button, FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f));
 	    }
 
 	  /* now fix up the button size */
@@ -582,7 +583,7 @@ Lisp_Object
 mswindows_get_toolbar_button_text ( struct frame* f, int command_id )
 {
   Lisp_Object button = Fgethash (make_int (command_id),
-				 FRAME_MSWINDOWS_TOOLBAR_HASHTABLE (f), Qnil);
+				 FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil);
   
   if (!NILP (button))
     {
@@ -605,7 +606,7 @@ mswindows_handle_toolbar_wm_command (struct frame* f, HWND ctrl, WORD id)
   Lisp_Object button, data, fn, arg, frame;
 
   button = Fgethash (make_int (id), 
-		     FRAME_MSWINDOWS_TOOLBAR_HASHTABLE (f), Qnil);
+		     FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil);
 
   if (NILP (button))
     return Qnil;