Fix various minor PS issues

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index a03f6ed21798f3f5e2ea10a5b0b8d96f7fa8024b..a323e44d694a37aa597b9b6607a154190d9030eb 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -19,7 +19,7 @@
     #include "wx/colour.h"
 #endif // WX_PRECOMP
 
     #include "wx/colour.h"
 #endif // WX_PRECOMP
 

-#include "wx/gtk/private.h" //for idle stuff
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxCursor
 
 //-----------------------------------------------------------------------------
 // wxCursor


@@ -379,7 +379,9 @@ GdkCursor *wxCursor::GetCursor() const
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 // busy cursor routines
 //-----------------------------------------------------------------------------
 

-extern wxCursor g_globalCursor;
+/* Current cursor, in order to hang on to
+ * cursor handle when setting the cursor globally */
+wxCursor g_globalCursor;

 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;


@@ -431,8 +433,6 @@ bool wxIsBusy()
 
 void wxSetCursor( const wxCursor& cursor )
 {
 
 void wxSetCursor( const wxCursor& cursor )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     g_globalCursor = cursor;
     g_globalCursor = cursor;

+    wxTheApp->WakeUpIdle();

 }
 }