fixed restoration of global cursor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index eb959e8ff8c3f6dfcf16a24867fea64e90e048df..f1ce135b33cb2e67f76c7c8886d13c5af1cd6c39 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -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)
 {
     if ( cursor.Ok() )
     {
         MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor());
 
 void wxSetCursor(const wxCursor& cursor)
 {
     if ( cursor.Ok() )
     {
         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(),
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     wxASSERT_MSG( !gs_savedCursor.Ok(),
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 

-    gs_savedCursor = g_globalCursor;
+    gs_savedCursor = gs_globalCursor;

     if ( cursor->Ok() )
         wxSetCursor(*cursor);
     else
     if ( cursor->Ok() )
         wxSetCursor(*cursor);
     else