X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a11672a469f036436838911c268cb2f8d5da5bf8..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index 55847bb23e..014064ea69 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "cursor.h" #endif @@ -20,7 +20,10 @@ #include "wx/utils.h" #include "wx/x11/private.h" + +#if !wxUSE_NANOX #include +#endif //----------------------------------------------------------------------------- // wxCursor @@ -64,6 +67,13 @@ wxCursor::wxCursor( int cursorId ) { m_refData = new wxCursorRefData(); +#if wxUSE_NANOX + // TODO Create some standard cursors from bitmaps. + + +#else + // !wxUSE_NANOX + M_CURSORDATA->m_display = wxGlobalDisplay(); wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") ); @@ -108,6 +118,7 @@ wxCursor::wxCursor( int cursorId ) } M_CURSORDATA->m_cursor = (WXCursor) XCreateFontCursor( (Display*) M_CURSORDATA->m_display, x_cur ); +#endif } wxCursor::wxCursor(const char bits[], int width, int height, @@ -192,7 +203,7 @@ void wxEndBusyCursor() gs_savedCursor = wxNullCursor; if (wxTheApp) - wxTheApp->SendIdleEvents(); + wxTheApp->ProcessIdle(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) @@ -208,7 +219,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) wxSetCursor( wxCursor(wxCURSOR_WATCH) ); if (wxTheApp) - wxTheApp->SendIdleEvents(); + wxTheApp->ProcessIdle(); } bool wxIsBusy()