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:
Vadim Zeitlin
2001-03-09 23:20:36 +00:00
parent 2b577448a7
commit 132cb64021

View File

@@ -1864,7 +1864,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
break; break;
case WM_MOVE: case WM_MOVE:
processed = HandleMove(LOWORD(lParam), HIWORD(lParam)); processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
break; break;
case WM_SIZE: case WM_SIZE:
@@ -1905,13 +1905,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
break; break;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
{ processed = HandleMouseMove(GET_X_LPARAM(lParam),
short x = LOWORD(lParam); GET_Y_LPARAM(lParam),
short y = HIWORD(lParam); wParam);
break;
processed = HandleMouseMove(x, y, wParam);
}
break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
// set focus to this window // set focus to this window
@@ -1928,12 +1925,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
case WM_MBUTTONUP: case WM_MBUTTONUP:
case WM_MBUTTONDBLCLK: case WM_MBUTTONDBLCLK:
{ processed = HandleMouseEvent(message,
short x = LOWORD(lParam); GET_X_LPARAM(lParam),
short y = HIWORD(lParam); GET_Y_LPARAM(lParam),
wParam);
processed = HandleMouseEvent(message, x, y, wParam);
}
break; break;
case MM_JOY1MOVE: case MM_JOY1MOVE:
@@ -1944,12 +1939,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
case MM_JOY2BUTTONDOWN: case MM_JOY2BUTTONDOWN:
case MM_JOY1BUTTONUP: case MM_JOY1BUTTONUP:
case MM_JOY2BUTTONUP: case MM_JOY2BUTTONUP:
{ processed = HandleJoystickEvent(message,
int x = LOWORD(lParam); GET_X_LPARAM(lParam),
int y = HIWORD(lParam); GET_Y_LPARAM(lParam),
wParam);
processed = HandleJoystickEvent(message, x, y, wParam);
}
break; break;
case WM_SYSCOMMAND: case WM_SYSCOMMAND: