X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54892273481657ae3b855cf5d40e328f38b6408c..8e7cb70ce34a3ba10fed3a7a708d66543eb314a6:/include/wx/msw/private.h?ds=sidebyside diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 075ce5f3a9..dd0bd996a3 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -335,9 +335,7 @@ inline RECT wxGetWindowRect(HWND hwnd) RECT rect; if ( !::GetWindowRect(hwnd, &rect) ) - { wxLogLastError(_T("GetWindowRect")); - } return rect; } @@ -347,9 +345,7 @@ inline RECT wxGetClientRect(HWND hwnd) RECT rect; if ( !::GetClientRect(hwnd, &rect) ) - { wxLogLastError(_T("GetClientRect")); - } return rect; } @@ -591,9 +587,7 @@ public: { m_ptr = GlobalLock(hGlobal); if ( !m_ptr ) - { wxLogLastError(_T("GlobalLock")); - } } ~GlobalPtrLock() @@ -896,9 +890,9 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data) // note that the casts to LONG_PTR here are required even on 32-bit machines // for the 64-bit warning mode of later versions of MSVC (C4311/4312) -inline void *wxGetWindowProc(HWND hwnd) +inline WNDPROC wxGetWindowProc(HWND hwnd) { - return (void *)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC); + return (WNDPROC)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC); } inline void *wxGetWindowUserData(HWND hwnd)