-1 is kept -1 as a wxWindowID

[wxWidgets.git] / src / gtk1 / cursor.cpp

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 93c10ada60d27683c167b04ded5e118c1dbbbb38..3c22177973243df95eff17d0fb71fea66bb32df5 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -84,7 +84,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
 */
         default:
-            wxFAIL_MSG("unsupported cursor type");
+            wxFAIL_MSG(_T("unsupported cursor type"));
             // will use the standard one
 
         case wxCURSOR_ARROW:
@@ -140,11 +140,15 @@ GdkCursor *wxCursor::GetCursor() const
 extern wxCursor *g_globalCursor;
 
 static wxCursor *gs_savedCursor = NULL;
+static int       gs_busyCount = 0;
 
 void wxEndBusyCursor()
 {
+    if ( --gs_busyCount > 0 )
+        return;
+
     wxCHECK_RET( gs_savedCursor && gs_savedCursor->Ok(),
-                 "calling wxEndBusyCursor() without wxBeginBusyCursor()?" );
+                 _T("calling wxEndBusyCursor() without wxBeginBusyCursor()?") );
 
     wxSetCursor(*gs_savedCursor);
     delete gs_savedCursor;
@@ -153,8 +157,11 @@ void wxEndBusyCursor()
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {
+    if ( gs_busyCount++ > 0 )
+        return;
+
     wxASSERT_MSG( !gs_savedCursor,
-                  "forgot to call wxEndBusyCursor, will leak memory" );
+                  _T("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = new wxCursor;
     if ( g_globalCursor && g_globalCursor->Ok() )
@@ -166,12 +173,10 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 
 bool wxIsBusy()
 {
-    return gs_savedCursor != NULL;
+    return gs_busyCount > 0;
 }
 
 void wxSetCursor( const wxCursor& cursor )
 {
     if (g_globalCursor) (*g_globalCursor) = cursor;
 }
-
-