Mercurial > dwindows
comparison os2/dw.c @ 499:b658d9628f41
Ok, so the code I just removed wasn't quite as bogus as I thought, but it
was wrong. ;) It is now fixed.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 12 Dec 2003 07:24:39 +0000 |
parents | 00d0514cadc8 |
children | fe12a72bfddf |
comparison
equal
deleted
inserted
replaced
498:00d0514cadc8 | 499:b658d9628f41 |
---|---|
2693 */ | 2693 */ |
2694 WinPostMsg(hWnd, WM_USER+2, mp1, mp2); | 2694 WinPostMsg(hWnd, WM_USER+2, mp1, mp2); |
2695 break; | 2695 break; |
2696 case WM_USER+2: | 2696 case WM_USER+2: |
2697 _clear_emphasis(); | 2697 _clear_emphasis(); |
2698 _free_menu_data((HWND)mp2); | 2698 if(dw_window_get_data((HWND)mp2, "_dw_popup")) |
2699 _free_menu_data((HWND)mp2); | |
2699 break; | 2700 break; |
2700 } | 2701 } |
2701 | 2702 |
2702 if(result != -1) | 2703 if(result != -1) |
2703 return (MRESULT)result; | 2704 return (MRESULT)result; |
4178 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y) | 4179 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y) |
4179 { | 4180 { |
4180 if(menu) | 4181 if(menu) |
4181 { | 4182 { |
4182 popup = parent; | 4183 popup = parent; |
4184 dw_window_set_data(*menu, "_dw_popup", (void *)1); | |
4183 WinPopupMenu(HWND_DESKTOP, parent, *menu, x, dw_screen_height() - y, 0, PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_VCONSTRAIN | PU_HCONSTRAIN); | 4185 WinPopupMenu(HWND_DESKTOP, parent, *menu, x, dw_screen_height() - y, 0, PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_VCONSTRAIN | PU_HCONSTRAIN); |
4184 } | 4186 } |
4185 } | 4187 } |
4186 | 4188 |
4187 /* | 4189 /* |