merged in the fix for WM_MOVE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1864,7 +1864,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
break;
|
||||
|
||||
case WM_MOVE:
|
||||
processed = HandleMove(LOWORD(lParam), HIWORD(lParam));
|
||||
processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
|
||||
break;
|
||||
|
||||
case WM_SIZE:
|
||||
@@ -1905,13 +1905,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
break;
|
||||
|
||||
case WM_MOUSEMOVE:
|
||||
{
|
||||
short x = LOWORD(lParam);
|
||||
short y = HIWORD(lParam);
|
||||
|
||||
processed = HandleMouseMove(x, y, wParam);
|
||||
}
|
||||
break;
|
||||
processed = HandleMouseMove(GET_X_LPARAM(lParam),
|
||||
GET_Y_LPARAM(lParam),
|
||||
wParam);
|
||||
break;
|
||||
|
||||
case WM_LBUTTONDOWN:
|
||||
// set focus to this window
|
||||
@@ -1928,12 +1925,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
case WM_MBUTTONDOWN:
|
||||
case WM_MBUTTONUP:
|
||||
case WM_MBUTTONDBLCLK:
|
||||
{
|
||||
short x = LOWORD(lParam);
|
||||
short y = HIWORD(lParam);
|
||||
|
||||
processed = HandleMouseEvent(message, x, y, wParam);
|
||||
}
|
||||
processed = HandleMouseEvent(message,
|
||||
GET_X_LPARAM(lParam),
|
||||
GET_Y_LPARAM(lParam),
|
||||
wParam);
|
||||
break;
|
||||
|
||||
case MM_JOY1MOVE:
|
||||
@@ -1944,12 +1939,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
case MM_JOY2BUTTONDOWN:
|
||||
case MM_JOY1BUTTONUP:
|
||||
case MM_JOY2BUTTONUP:
|
||||
{
|
||||
int x = LOWORD(lParam);
|
||||
int y = HIWORD(lParam);
|
||||
|
||||
processed = HandleJoystickEvent(message, x, y, wParam);
|
||||
}
|
||||
processed = HandleJoystickEvent(message,
|
||||
GET_X_LPARAM(lParam),
|
||||
GET_Y_LPARAM(lParam),
|
||||
wParam);
|
||||
break;
|
||||
|
||||
case WM_SYSCOMMAND:
|
||||
|
Reference in New Issue
Block a user