Mercurial > hg > xemacs-beta
diff src/menubar-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 | 71ee43b8a74d |
| children | 308d34e9f07d |
line wrap: on
line diff
--- a/src/menubar-msw.c Mon Apr 05 13:03:35 2010 +0100 +++ b/src/menubar-msw.c Tue Apr 06 15:08:22 2010 +0100 @@ -160,9 +160,9 @@ static Lisp_Object allocate_menu_item_id (Lisp_Object path, Lisp_Object name, Lisp_Object suffix) { - UINT id = MENU_ITEM_ID_BITS (HASH3 (internal_hash (path, 0), - internal_hash (name, 0), - internal_hash (suffix, 0))); + UINT id = MENU_ITEM_ID_BITS (HASH3 (internal_hash (path, 0, 0), + internal_hash (name, 0, 0), + internal_hash (suffix, 0, 0))); do { id = MENU_ITEM_ID_BITS (id + 1); } while (GetMenuState (top_level_menu, id, MF_BYCOMMAND) != 0xFFFFFFFF); @@ -202,18 +202,18 @@ if (separator_string_p (XSTRING_DATA (item))) return 13; else - return internal_hash (item, 0) + 13; + return internal_hash (item, 0, 0) + 13; } else if (CONSP (item)) { /* Submenu - hash by its string name + 0 */ - return internal_hash (XCAR (item), 0); + return internal_hash (XCAR (item), 0, 0); } else if (VECTORP (item)) { /* An ordinary item - hash its name and callback form. */ - return HASH2 (internal_hash (XVECTOR_DATA(item)[0], 0), - internal_hash (XVECTOR_DATA(item)[1], 0)); + return HASH2 (internal_hash (XVECTOR_DATA(item)[0], 0, 0), + internal_hash (XVECTOR_DATA(item)[1], 0, 0)); } /* An error - will be caught later */