X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da51aebeec14342c697d4d74fcb06d3d216ba4f0..6c73e20df7f3a7ea8c2059a816ffd3655ea2b848:/src/os2/window.cpp diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 6af67866bb..068003159d 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -46,6 +46,7 @@ #include "wx/settings.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/textctrl.h" #include #endif @@ -73,9 +74,6 @@ #include "wx/caret.h" #endif // wxUSE_CARET - -#include "wx/textctrl.h" - #include // @@ -2394,9 +2392,6 @@ MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg, case WM_BUTTON3MOTIONEND: case WM_BUTTON3MOTIONSTART: { - if (uMsg == WM_BUTTON1DOWN && AcceptsFocus()) - SetFocus(); - short nX = LOWORD(wParam); short nY = HIWORD(wParam); @@ -5046,12 +5041,20 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& rPt) // Get the current mouse position. wxPoint wxGetMousePosition() { - POINTL vPt; + POINTL vPt; ::WinQueryPointerPos(HWND_DESKTOP, &vPt); return wxPoint(vPt.x, vPt.y); } +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + // TODO + return ms; +} + + wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin, short* WXUNUSED(pnX), short* WXUNUSED(pnY) )