Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
This commit is contained in:
@@ -2404,7 +2404,7 @@ void
|
||||
nh_XtPopup(w, g, childwid)
|
||||
Widget w; /* widget */
|
||||
int g; /* type of grab */
|
||||
Widget childwid; /* child to recieve focus (can be None) */
|
||||
Widget childwid; /* child to receive focus (can be None) */
|
||||
{
|
||||
XtPopup(w, (XtGrabKind) g);
|
||||
XSetWMProtocols(XtDisplay(w), XtWindow(w), &wm_delete_window, 1);
|
||||
|
||||
@@ -826,7 +826,7 @@ menu_item **menu_list;
|
||||
* each time.
|
||||
*/
|
||||
if (menu_info->valid_widgets
|
||||
&& (window != WIN_INVEN || !flags.perm_invent)) {
|
||||
&& (window != WIN_INVEN || !iflags.perm_invent)) {
|
||||
XtDestroyWidget(wp->popup);
|
||||
menu_info->valid_widgets = FALSE;
|
||||
menu_info->is_up = FALSE;
|
||||
|
||||
Reference in New Issue
Block a user