X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7bdcdd70dc6e74e35185559e1c2ff2cac3e9e6e..40779a03e7745fede941ac1a55eb26c062dfa086:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 9335e8c837..e660bcc9ea 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -13,6 +13,7 @@ #endif #include "wx/cursor.h" +#include "wx/utils.h" #include "gdk/gdk.h" @@ -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;