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

wxSetCursor() bug with splitters corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-27 01:33:05 +00:00
parent ed93168bf9
commit f4621a09f0
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/window.cpp
View File

@@ -1495,16 +1495,24 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
hcursor = gs_wxBusyCursor;
}
else if ( m_windowCursor.Ok() )
{
hcursor = (HCURSOR)m_windowCursor.GetHCURSOR();
}
else
{
extern wxCursor *g_globalCursor; // from msw\data.cpp
wxCursor *cursor = NULL;
if ( g_globalCursor && g_globalCursor->Ok() )
hcursor = (HCURSOR)g_globalCursor->GetHCURSOR();
if ( m_windowCursor.Ok() )
{
cursor = &m_windowCursor;
}
else
{
extern wxCursor *g_globalCursor; // from msw\data.cpp
if ( g_globalCursor && g_globalCursor->Ok() )
cursor = g_globalCursor;
}
if ( cursor )
hcursor = (HCURSOR)cursor->GetHCURSOR();
}
if ( hcursor )
@@ -1512,8 +1520,8 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
::SetCursor(hcursor);
// returning TRUE stops the DefWindowProc() from further
// processing this message - exactly what we need because
// we've just set the cursor
// processing this message - exactly what we need because we've
// just set the cursor.
return TRUE;
}
}