image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 9e96423d55f80902d8dfba601b062dc4a2a4dfc0..80f7c26d60cb6bb71cf12ba4d122e6fdef7865fb 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -13,8 +13,9 @@
 #endif
 
 #include "wx/cursor.h"
+#include "wx/utils.h"
 
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -64,7 +65,7 @@ wxCursor::wxCursor( int cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
-        case wxCURSOR_DEFAULT:          gdk_cur = GDK_X_CURSOR; break;
+        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;
@@ -85,6 +86,10 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_LEFT_BUTTON:      gdk_cur = GDK_LEFTBUTTON; break;
         case wxCURSOR_MIDDLE_BUTTON:    gdk_cur = GDK_MIDDLEBUTTON; break;
         case wxCURSOR_RIGHT_BUTTON:     gdk_cur = GDK_RIGHTBUTTON; break;
+        case wxCURSOR_BULLSEYE:         gdk_cur = GDK_TARGET; break;
+
+        case wxCURSOR_POINT_LEFT:       gdk_cur = GDK_SB_LEFT_ARROW; break;
+        case wxCURSOR_POINT_RIGHT:      gdk_cur = GDK_SB_RIGHT_ARROW; break;
 /*
         case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;
@@ -92,7 +97,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
 */
         default:
-            wxFAIL_MSG(_T("unsupported cursor type"));
+            wxFAIL_MSG(wxT("unsupported cursor type"));
             // will use the standard one
 
         case wxCURSOR_ARROW:
@@ -157,6 +162,8 @@ void wxEndBusyCursor()
 
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
+
+    wxYield();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
@@ -165,11 +172,13 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
         return;
 
     wxASSERT_MSG( !gs_savedCursor.Ok(),
-                  _T("forgot to call wxEndBusyCursor, will leak memory") );
+                  wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;
-    
+
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
+
+    wxYield();
 }
 
 bool wxIsBusy()
@@ -179,7 +188,7 @@ bool wxIsBusy()
 
 void wxSetCursor( const wxCursor& cursor )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     g_globalCursor = cursor;