Mercurial > dwindows
comparison os2/dw.c @ 498:00d0514cadc8
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.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 12 Dec 2003 07:14:17 +0000 |
parents | a7f478e9c20c |
children | b658d9628f41 |
comparison
equal
deleted
inserted
replaced
497:a7f478e9c20c | 498:00d0514cadc8 |
---|---|
2686 else | 2686 else |
2687 _free_window_memory(hWnd); | 2687 _free_window_memory(hWnd); |
2688 } | 2688 } |
2689 break; | 2689 break; |
2690 case WM_MENUEND: | 2690 case WM_MENUEND: |
2691 /* Delay removing the signal until we've executed | |
2692 * the signal handler. | |
2693 */ | |
2694 WinPostMsg(hWnd, WM_USER+2, mp1, mp2); | |
2695 break; | |
2696 case WM_USER+2: | |
2691 _clear_emphasis(); | 2697 _clear_emphasis(); |
2692 if(dw_window_get_data((HWND)mp2, "_dw_popup")) | 2698 _free_menu_data((HWND)mp2); |
2693 _free_menu_data((HWND)mp2); | |
2694 break; | 2699 break; |
2695 } | 2700 } |
2696 | 2701 |
2697 if(result != -1) | 2702 if(result != -1) |
2698 return (MRESULT)result; | 2703 return (MRESULT)result; |