X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index 014064ea69..03d92bd650 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -1,23 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.cpp +// Name: src/x11/cursor.cpp // Purpose: wxCursor class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "cursor.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/cursor.h" -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/app.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/icon.h" + #include "wx/gdicmn.h" +#endif #include "wx/x11/private.h" @@ -69,14 +71,14 @@ wxCursor::wxCursor( int cursorId ) #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") ); - + int x_cur = XC_left_ptr; switch (cursorId) { @@ -125,19 +127,13 @@ wxCursor::wxCursor(const char bits[], int width, int height, int hotSpotX, int hotSpotY, const char maskBits[], wxColour *fg, wxColour *bg) { - wxFAIL_MSG( "wxCursor creation from bits not yet implemented" ); -} - - -wxCursor::wxCursor( const wxCursor &cursor ) -{ - Ref( cursor ); + wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") ); } #if wxUSE_IMAGE wxCursor::wxCursor( const wxImage & image ) { - wxFAIL_MSG( "wxCursor creation from wxImage not yet implemented" ); + wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") ); } #endif @@ -145,16 +141,6 @@ wxCursor::~wxCursor() { } -wxCursor& wxCursor::operator = ( const wxCursor& cursor ) -{ - if (*this == cursor) - return (*this); - - Ref( cursor ); - - return *this; -} - bool wxCursor::operator == ( const wxCursor& cursor ) const { return m_refData == cursor.m_refData; @@ -206,7 +192,7 @@ void wxEndBusyCursor() wxTheApp->ProcessIdle(); } -void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) +void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) { if (gs_busyCount++ > 0) return;