X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..8535af00e277ee89c877e9cb3ac357791119f497:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 4876e3f8d3..80f7c26d60 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -15,7 +15,7 @@ #include "wx/cursor.h" #include "wx/utils.h" -#include "gdk/gdk.h" +#include //----------------------------------------------------------------------------- // idle system @@ -86,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; @@ -93,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: @@ -158,6 +162,8 @@ void wxEndBusyCursor() wxSetCursor( gs_savedCursor ); gs_savedCursor = wxNullCursor; + + wxYield(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) @@ -166,12 +172,12 @@ 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(); } @@ -182,7 +188,7 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); g_globalCursor = cursor;