X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/mgl/cursor.cpp diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index eedb0085dc..8832eff0e7 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -72,7 +72,7 @@ void wxCursor::InitFromStock(wxStockCursor cursorId) if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() ) { - wxLogTrace(_T("mglcursor"), _T("cursor id %i fetched from cache"), cursorId); + wxLogTrace(wxT("mglcursor"), wxT("cursor id %i fetched from cache"), cursorId); *this = (*gs_cursorsHash)[cursorId]; return; } @@ -135,7 +135,7 @@ void wxCursor::InitFromStock(wxStockCursor cursorId) else { (*gs_cursorsHash)[cursorId] = *this; - wxLogTrace(_T("mglcursor"), _T("cursor id %i added to cache (%s)"), + wxLogTrace(wxT("mglcursor"), wxT("cursor id %i added to cache (%s)"), cursorId, cursorname); } } @@ -180,7 +180,7 @@ static wxCursor gs_globalCursor = wxNullCursor; void wxSetCursor(const wxCursor& cursor) { - if ( cursor.Ok() ) + if ( cursor.IsOk() ) { if ( g_winMng ) MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor()); @@ -225,11 +225,11 @@ void wxBeginBusyCursor(const wxCursor *cursor) { if ( gs_busyCount++ > 0 ) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = gs_globalCursor; - if ( cursor->Ok() ) + if ( cursor->IsOk() ) wxSetCursor(*cursor); else wxSetCursor(wxCursor(wxCURSOR_WAIT));