diff --git a/uppsrc/CtrlCore/CtrlDraw.cpp b/uppsrc/CtrlCore/CtrlDraw.cpp index bf21e56e7..0dca4640a 100644 --- a/uppsrc/CtrlCore/CtrlDraw.cpp +++ b/uppsrc/CtrlCore/CtrlDraw.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) DLOG(x) +#define LLOG(x) // DLOG(x) #define LTIMING(x) // TIMING(x) bool Ctrl::globalbackpaint; diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp index cbf59ea07..db92a0395 100644 --- a/uppsrc/CtrlCore/CtrlMouse.cpp +++ b/uppsrc/CtrlCore/CtrlMouse.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) // DLOG(x) +#define LLOG(x) // DLOG(x) Ptr Ctrl::eventCtrl; Ptr Ctrl::mouseCtrl; diff --git a/uppsrc/CtrlCore/Win32Proc.cpp b/uppsrc/CtrlCore/Win32Proc.cpp index 85fdf7a75..d93b3119f 100644 --- a/uppsrc/CtrlCore/Win32Proc.cpp +++ b/uppsrc/CtrlCore/Win32Proc.cpp @@ -234,8 +234,11 @@ LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) { EndIgnore(); return 0L; } - if(_this) - DoMouse(MOUSEWHEEL, Point((dword)lParam), (short)HIWORD(wParam)); + if(_this) { + Point p(0, 0); + ::ClientToScreen(hwnd, p); + DoMouse(MOUSEWHEEL, Point((dword)lParam) - p, (short)HIWORD(wParam)); + } if(_this) PostInput(); return 0L; case WM_SETCURSOR: