1170 |
/* Create a new pane. */ |
/* Create a new pane. */ |
1171 |
Lisp_Object pane_name, prefix; |
Lisp_Object pane_name, prefix; |
1172 |
char *pane_string; |
char *pane_string; |
1173 |
|
|
1174 |
pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
1175 |
prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
1176 |
|
|
1177 |
#ifndef HAVE_MULTILINGUAL_MENU |
#ifndef HAVE_MULTILINGUAL_MENU |
1178 |
if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
1179 |
pane_name = ENCODE_SYSTEM (pane_name); |
{ |
1180 |
|
pane_name = ENCODE_SYSTEM (pane_name); |
1181 |
|
AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name; |
1182 |
|
} |
1183 |
#endif |
#endif |
1184 |
pane_string = (NILP (pane_name) |
pane_string = (NILP (pane_name) |
1185 |
? "" : (char *) XSTRING (pane_name)->data); |
? "" : (char *) XSTRING (pane_name)->data); |
1217 |
Lisp_Object item_name, enable, descrip, def, type, selected; |
Lisp_Object item_name, enable, descrip, def, type, selected; |
1218 |
Lisp_Object help; |
Lisp_Object help; |
1219 |
|
|
1220 |
item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; |
item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); |
1221 |
enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; |
enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); |
1222 |
descrip |
descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); |
1223 |
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; |
def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION); |
1224 |
def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION]; |
type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE); |
1225 |
type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE]; |
selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED); |
1226 |
selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED]; |
help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); |
|
help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; |
|
1227 |
|
|
1228 |
#ifndef HAVE_MULTILINGUAL_MENU |
#ifndef HAVE_MULTILINGUAL_MENU |
1229 |
if (STRING_MULTIBYTE (item_name)) |
if (STRING_MULTIBYTE (item_name)) |
1230 |
item_name = ENCODE_SYSTEM (item_name); |
{ |
1231 |
|
item_name = ENCODE_SYSTEM (item_name); |
1232 |
|
AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; |
1233 |
|
} |
1234 |
|
|
1235 |
if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
1236 |
descrip = ENCODE_SYSTEM (descrip); |
{ |
1237 |
#endif |
descrip = ENCODE_SYSTEM (descrip); |
1238 |
|
AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip; |
1239 |
|
} |
1240 |
|
#endif /* not HAVE_MULTILINGUAL_MENU */ |
1241 |
|
|
1242 |
wv = xmalloc_widget_value (); |
wv = xmalloc_widget_value (); |
1243 |
if (prev_wv) |
if (prev_wv) |
1535 |
f->output_data.w32->menubar_widget = NULL; |
f->output_data.w32->menubar_widget = NULL; |
1536 |
DestroyMenu (old); |
DestroyMenu (old); |
1537 |
} |
} |
1538 |
|
|
1539 |
UNBLOCK_INPUT; |
UNBLOCK_INPUT; |
1540 |
} |
} |
1541 |
|
|
1626 |
/* Create a new pane. */ |
/* Create a new pane. */ |
1627 |
Lisp_Object pane_name, prefix; |
Lisp_Object pane_name, prefix; |
1628 |
char *pane_string; |
char *pane_string; |
1629 |
pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); |
1630 |
prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |
prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); |
1631 |
#ifndef HAVE_MULTILINGUAL_MENU |
#ifndef HAVE_MULTILINGUAL_MENU |
1632 |
if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name)) |
if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) |
1633 |
pane_name = ENCODE_SYSTEM (pane_name); |
{ |
1634 |
|
pane_name = ENCODE_SYSTEM (pane_name); |
1635 |
|
AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name; |
1636 |
|
} |
1637 |
#endif |
#endif |
1638 |
pane_string = (NILP (pane_name) |
pane_string = (NILP (pane_name) |
1639 |
? "" : (char *) XSTRING (pane_name)->data); |
? "" : (char *) XSTRING (pane_name)->data); |
1674 |
/* Create a new item within current pane. */ |
/* Create a new item within current pane. */ |
1675 |
Lisp_Object item_name, enable, descrip, def, type, selected, help; |
Lisp_Object item_name, enable, descrip, def, type, selected, help; |
1676 |
|
|
1677 |
item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; |
item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); |
1678 |
enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; |
enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE); |
1679 |
descrip |
descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY); |
1680 |
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; |
def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION); |
1681 |
def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION]; |
type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE); |
1682 |
type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE]; |
selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED); |
1683 |
selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED]; |
help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP); |
|
help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; |
|
1684 |
|
|
1685 |
#ifndef HAVE_MULTILINGUAL_MENU |
#ifndef HAVE_MULTILINGUAL_MENU |
1686 |
if (STRINGP (item_name) && STRING_MULTIBYTE (item_name)) |
if (STRINGP (item_name) && STRING_MULTIBYTE (item_name)) |
1687 |
item_name = ENCODE_SYSTEM (item_name); |
{ |
1688 |
|
item_name = ENCODE_SYSTEM (item_name); |
1689 |
|
AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name; |
1690 |
|
} |
1691 |
if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) |
1692 |
descrip = ENCODE_SYSTEM (descrip); |
{ |
1693 |
#endif |
descrip = ENCODE_SYSTEM (descrip); |
1694 |
|
AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip; |
1695 |
|
} |
1696 |
|
#endif /* not HAVE_MULTILINGUAL_MENU */ |
1697 |
|
|
1698 |
wv = xmalloc_widget_value (); |
wv = xmalloc_widget_value (); |
1699 |
if (prev_wv) |
if (prev_wv) |
1719 |
abort (); |
abort (); |
1720 |
|
|
1721 |
wv->selected = !NILP (selected); |
wv->selected = !NILP (selected); |
|
|
|
1722 |
if (STRINGP (help)) |
if (STRINGP (help)) |
1723 |
wv->help = (char *) XSTRING (help)->data; |
wv->help = (char *) XSTRING (help)->data; |
1724 |
else |
else |