# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1071213257 0 # Node ID 00d0514cadc8cfa6752ed16cec74c53ac362c7da # Parent a7f478e9c20c4ea7b19512d8f43a53c55ce461b6 Fixes to the new popup menu code, removed a bogus check that was causing the obsolete signal handlers to hang around. Also added code to delay removing the signal handlers until after the WM_COMMAND has been run. diff -r a7f478e9c20c -r 00d0514cadc8 os2/dw.c --- a/os2/dw.c Fri Dec 12 05:45:44 2003 +0000 +++ b/os2/dw.c Fri Dec 12 07:14:17 2003 +0000 @@ -2688,9 +2688,14 @@ } break; case WM_MENUEND: + /* Delay removing the signal until we've executed + * the signal handler. + */ + WinPostMsg(hWnd, WM_USER+2, mp1, mp2); + break; + case WM_USER+2: _clear_emphasis(); - if(dw_window_get_data((HWND)mp2, "_dw_popup")) - _free_menu_data((HWND)mp2); + _free_menu_data((HWND)mp2); break; }