Mercurial > hg > xemacs-beta
diff src/toolbar-msw.c @ 5192:635f4b506855
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 |
line wrap: on
line diff
--- a/src/toolbar-msw.c Mon Apr 05 13:03:35 2010 +0100 +++ b/src/toolbar-msw.c Tue Apr 06 15:08:22 2010 +0100 @@ -66,7 +66,7 @@ enum edge_pos UNUSED (pos)) { /* hmm what do we generate an id based on */ - int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0)); + int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0, 0)); while (!NILP (Fgethash (make_int (id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil))) { @@ -187,8 +187,8 @@ struct toolbar_button *tb = XTOOLBAR_BUTTON (button); checksum = HASH5 (checksum, - internal_hash (get_toolbar_button_glyph (w, tb), 0), - internal_hash (tb->callback, 0), + internal_hash (get_toolbar_button_glyph (w, tb), 0, 0), + internal_hash (tb->callback, 0, 0), width, LISP_HASH (w->toolbar_buttons_captioned_p)); button = tb->next;