comparison src/macmenu.c @ 48625:b696e2bae8da

2002-12-02 Andrew Choi <akochoi@shaw.ca> * macmenu.c (add_menu_item, fill_menubar): Truncate menu item names to 255 characters. * macterm.c (XTread_socket): If all frames have been collapsed, expand the first one before handling drag-and-drop events. * s/darwin.h (GETPGRP_NO_ARG): Delete. Replaced by GETPGRP_VOID, which is detected by autoconf.
author Andrew Choi <akochoi@shaw.ca>
date Mon, 02 Dec 2002 17:13:46 +0000
parents af8ff2a92902
children 3cabed8b65b7
comparison
equal deleted inserted replaced
48624:7d37fc403193 48625:b696e2bae8da
2224 pos = CountMItems (menu); 2224 pos = CountMItems (menu);
2225 #endif 2225 #endif
2226 2226
2227 strcpy (item_name, ""); 2227 strcpy (item_name, "");
2228 for (i = 0; i < indent; i++) 2228 for (i = 0; i < indent; i++)
2229 strcat (item_name, " "); 2229 strncat (item_name, " ", 255);
2230 strcat (item_name, wv->name); 2230 strncat (item_name, wv->name, 255);
2231 if (wv->key != NULL) 2231 if (wv->key != NULL)
2232 { 2232 {
2233 strcat (item_name, " "); 2233 strncat (item_name, " ", 255);
2234 strcat (item_name, wv->key); 2234 strncat (item_name, wv->key, 255);
2235 } 2235 }
2236 item_name[255] = 0;
2236 c2pstr (item_name); 2237 c2pstr (item_name);
2237 SetMenuItemText (menu, pos, item_name); 2238 SetMenuItemText (menu, pos, item_name);
2238 2239
2239 if (wv->enabled && !force_disable) 2240 if (wv->enabled && !force_disable)
2240 #if TARGET_API_MAC_CARBON 2241 #if TARGET_API_MAC_CARBON
2314 for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++) 2315 for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++)
2315 { 2316 {
2316 MenuHandle menu; 2317 MenuHandle menu;
2317 Str255 title; 2318 Str255 title;
2318 2319
2319 strcpy (title, wv->name); 2320 strncpy (title, wv->name, 255);
2321 title[255] = 0;
2320 c2pstr (title); 2322 c2pstr (title);
2321 menu = NewMenu (id, title); 2323 menu = NewMenu (id, title);
2322 2324
2323 if (wv->contents) 2325 if (wv->contents)
2324 fill_menu (menu, wv->contents); 2326 fill_menu (menu, wv->contents);