X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..fd749f4a7050095cc4773279ed681ceaf30c9cb3:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index 77ac73f161..fb29364b43 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -1,19 +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 ///////////////////////////////////////////////////////////////////////////// +// 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" @@ -30,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); WXCursor m_cursor; WXDisplay *m_display; @@ -65,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) { @@ -135,17 +141,7 @@ wxCursor::~wxCursor() { } -bool wxCursor::operator == ( const wxCursor& cursor ) const -{ - return m_refData == cursor.m_refData; -} - -bool wxCursor::operator != ( const wxCursor& cursor ) const -{ - return m_refData != cursor.m_refData; -} - -bool wxCursor::Ok() const +bool wxCursor::IsOk() const { return (m_refData != NULL); }