merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -217,8 +217,9 @@ void wxCursor::MacInstall() const
{
if ( m_refData && M_CURSORDATA->m_hCursor )
{
::SetCursor( *((CursHandle)M_CURSORDATA->m_hCursor) ) ;
gMacCurrentCursor = (CursHandle)M_CURSORDATA->m_hCursor ;
CursHandle ch = ((CursHandle)M_CURSORDATA->m_hCursor) ;
::SetCursor( *ch ) ;
gMacCurrentCursor = ch ;
}
else
{