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

fixed restoration of global cursor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-14 22:18:09 +00:00
parent c109254cc6
commit 5fd1ea325c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mgl/cursor.cpp
View File

@@ -197,14 +197,19 @@ MGLCursor *wxCursor::GetMGLCursor() const
// Global cursor setting // Global cursor setting
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxCursor g_globalCursor = wxNullCursor; static wxCursor gs_globalCursor = wxNullCursor;
void wxSetCursor(const wxCursor& cursor) void wxSetCursor(const wxCursor& cursor)
{ {
if ( cursor.Ok() ) if ( cursor.Ok() )
{ {
MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor()); MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor());
g_globalCursor = cursor; gs_globalCursor = cursor;
}
else
{
MGL_wmSetGlobalCursor(g_winMng, NULL);
gs_globalCursor = wxNullCursor;
} }
} }
@@ -224,7 +229,7 @@ const wxCursor &wxBusyCursor::GetStoredCursor()
const wxCursor wxBusyCursor::GetBusyCursor() const wxCursor wxBusyCursor::GetBusyCursor()
{ {
return wxCursor(wxCURSOR_WAIT); return gs_globalCursor;
} }
void wxEndBusyCursor() void wxEndBusyCursor()
@@ -242,7 +247,7 @@ void wxBeginBusyCursor(wxCursor *cursor)
wxASSERT_MSG( !gs_savedCursor.Ok(), wxASSERT_MSG( !gs_savedCursor.Ok(),
wxT("forgot to call wxEndBusyCursor, will leak memory") ); wxT("forgot to call wxEndBusyCursor, will leak memory") );
gs_savedCursor = g_globalCursor; gs_savedCursor = gs_globalCursor;
if ( cursor->Ok() ) if ( cursor->Ok() )
wxSetCursor(*cursor); wxSetCursor(*cursor);
else else