Mercurial > hg > xemacs-beta

comparison src/toolbar-msw.c @ 5192:635f4b506855

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call internal_hash() with its new arg, Win32-specific code, fixing build src/ChangeLog addition: 2010-04-06 Aidan Kehoe <kehoea@parhasard.net> * toolbar-msw.c (allocate_toolbar_item_id) (mswindows_output_toolbar): * menubar-msw.c (allocate_menu_item_id, checksum_menu_item): * glyphs-msw.c (mswindows_image_instance_hash): * fontcolor-msw.c (mswindows_color_instance_equal): * device-msw.c (hash_devmode): Call internal_hash() with the correct number of arguments, declare various hash methods with the correct number of arguments, fixing the Win32 build. Thank you Vin.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 06 Apr 2010 15:08:22 +0100
parents 97eb4942aec8
children 308d34e9f07d
comparison
equal deleted inserted replaced
5191:71ee43b8a74d 5192:635f4b506855
64 static int 64 static int
65 allocate_toolbar_item_id (struct frame *f, struct toolbar_button *button, 65 allocate_toolbar_item_id (struct frame *f, struct toolbar_button *button,
66 enum edge_pos UNUSED (pos)) 66 enum edge_pos UNUSED (pos))
67 { 67 {
68 /* hmm what do we generate an id based on */ 68 /* hmm what do we generate an id based on */
69 int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0)); 69 int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0, 0));
70 while (!NILP (Fgethash (make_int (id), 70 while (!NILP (Fgethash (make_int (id),
71 FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil))) 71 FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil)))
72 { 72 {
73 id = TOOLBAR_ITEM_ID_BITS (id + 1); 73 id = TOOLBAR_ITEM_ID_BITS (id + 1);
74 } 74 }
185 while (!NILP (button)) 185 while (!NILP (button))
186 { 186 {
187 187
188 struct toolbar_button *tb = XTOOLBAR_BUTTON (button); 188 struct toolbar_button *tb = XTOOLBAR_BUTTON (button);
189 checksum = HASH5 (checksum, 189 checksum = HASH5 (checksum,
190 internal_hash (get_toolbar_button_glyph (w, tb), 0), 190 internal_hash (get_toolbar_button_glyph (w, tb), 0, 0),
191 internal_hash (tb->callback, 0), 191 internal_hash (tb->callback, 0, 0),
192 width, 192 width,
193 LISP_HASH (w->toolbar_buttons_captioned_p)); 193 LISP_HASH (w->toolbar_buttons_captioned_p));
194 button = tb->next; 194 button = tb->next;
195 nbuttons++; 195 nbuttons++;
196 } 196 }