Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. fixed memory leak in GAddress

Browse Source 
2. fixed memory leak with wxLogStderr in wxBase
3. updated tmake files/makefiles for wxBase with wxSocket under MSW
4. fixed wxSashWindow cursor bug by allowing SetCursor(wxNullCursor)
5. fixed warning in gsock*.c


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-16 01:03:52 +00:00
parent 9eb662e94c
commit 8a9c22462a
7 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/window.cpp
View File

@@ -469,20 +469,20 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
return FALSE;
}
wxASSERT_MSG( m_cursor.Ok(),
wxT("cursor must be valid after call to the base version"));
if ( m_cursor.Ok() )
{
HWND hWnd = GetHwnd();
HWND hWnd = GetHwnd();
// Change the cursor NOW if we're within the correct window
POINT point;
::GetCursorPos(&point);
// Change the cursor NOW if we're within the correct window
POINT point;
::GetCursorPos(&point);
RECT rect;
::GetWindowRect(hWnd, &rect);
RECT rect;
::GetWindowRect(hWnd, &rect);
if ( ::PtInRect(&rect, point) && !wxIsBusy() )
::SetCursor(GetHcursorOf(m_cursor));
if ( ::PtInRect(&rect, point) && !wxIsBusy() )
::SetCursor(GetHcursorOf(m_cursor));
}
return TRUE;
}