X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c39369e5a9b2298eed8adc64a229482d5d90dd1..babd4308f2704f4234e271d29a8e8c1e211b4af6:/src/gtk1/cursor.cpp

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 93c10ada60..7a47bd6bd9 100644
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -13,9 +13,17 @@
 #endif
 
 #include "wx/cursor.h"
+#include "wx/utils.h"
 
 #include "gdk/gdk.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
@@ -57,6 +65,7 @@ wxCursor::wxCursor( int cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
+        case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;
         case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
@@ -84,7 +93,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:
@@ -137,41 +146,46 @@ GdkCursor *wxCursor::GetCursor() const
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
-extern wxCursor *g_globalCursor;
+extern wxCursor g_globalCursor;
 
-static wxCursor *gs_savedCursor = NULL;
+static wxCursor  gs_savedCursor;
+static int       gs_busyCount = 0;
 
 void wxEndBusyCursor()
 {
-    wxCHECK_RET( gs_savedCursor && gs_savedCursor->Ok(),
-                 "calling wxEndBusyCursor() without wxBeginBusyCursor()?" );
+    if (--gs_busyCount > 0)
+        return;
 
-    wxSetCursor(*gs_savedCursor);
-    delete gs_savedCursor;
-    gs_savedCursor = NULL;
+    wxSetCursor( gs_savedCursor );
+    gs_savedCursor = wxNullCursor;
+    
+    wxYield();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {
-    wxASSERT_MSG( !gs_savedCursor,
-                  "forgot to call wxEndBusyCursor, will leak memory" );
+    if (gs_busyCount++ > 0)
+        return;
 
-    gs_savedCursor = new wxCursor;
-    if ( g_globalCursor && g_globalCursor->Ok() )
-        *gs_savedCursor = *g_globalCursor;
-    else
-        *gs_savedCursor = wxCursor(wxCURSOR_ARROW);
-    wxSetCursor(wxCursor(wxCURSOR_WATCH));
+    wxASSERT_MSG( !gs_savedCursor.Ok(),
+                  _T("forgot to call wxEndBusyCursor, will leak memory") );
+
+    gs_savedCursor = g_globalCursor;
+    
+    wxSetCursor( wxCursor(wxCURSOR_WATCH) );
+    
+    wxYield();
 }
 
 bool wxIsBusy()
 {
-    return gs_savedCursor != NULL;
+    return gs_busyCount > 0;
 }
 
 void wxSetCursor( const wxCursor& cursor )
 {
-    if (g_globalCursor) (*g_globalCursor) = cursor;
-}
-
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
+    g_globalCursor = cursor;
+}