Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Popup Menu processing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-28 23:10:25 +00:00
parent 13b76aae87
commit bdfd8d7776
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/os2/window.cpp
View File

@@ -1981,22 +1981,22 @@ bool wxWindowOS2::DoPopupMenu(
,nX
,nY
,0L
,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON2DOWN | PU_MOUSEBUTTON2
,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_KEYBOARD
);
while(bIsWaiting)
{
QMSG vMsg;
QMSG vMsg;
BOOL bRc = ::WinGetMsg(vHabmain, &vMsg, HWND(NULL), 0, 0);
while (::WinPeekMsg(vHabmain, &vMsg, (HWND)0, WM_COMMAND, WM_COMMAND, PM_REMOVE)
&& vMsg.msg != WM_QUIT)
if (vMsg.msg == WM_MENUEND || vMsg.msg == WM_COMMAND)
{
wxTheApp->DoMessage((WXMSG*)&vMsg);
bIsWaiting = FALSE;
}
if (vMsg.msg == WM_DESTROY || vMsg.msg == WM_QUIT)
break;
::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
}
wxCurrentPopupMenu = NULL;
pMenu->SetInvokingWindow(NULL);
return TRUE;
} // end of wxWindowOS2::DoPopupMenu
@@ -2498,8 +2498,8 @@ MRESULT wxWindowOS2::OS2WindowProc(
case WM_BUTTON3MOTIONEND:
case WM_BUTTON3MOTIONSTART:
{
short x = LOWORD(lParam);
short y = HIWORD(lParam);
short x = LOWORD(wParam);
short y = HIWORD(wParam);
bProcessed = HandleMouseEvent(uMsg, x, y, (WXUINT)wParam);
}