X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..409521e45d44fc57df39efcb965701d378edcb20:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index b94f974e5a..1e1efbc681 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -16,12 +16,11 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/utils.h" + #include "wx/icon.h" + #include "wx/gdicmn.h" #endif -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/utils.h" - #include "wx/x11/private.h" #if !wxUSE_NANOX @@ -37,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); WXCursor m_cursor; WXDisplay *m_display; @@ -124,15 +123,17 @@ wxCursor::wxCursor( int cursorId ) #endif } -wxCursor::wxCursor(const char bits[], int width, int height, - int hotSpotX, int hotSpotY, - const char maskBits[], wxColour *fg, wxColour *bg) +wxCursor::wxCursor(const char WXUNUSED(bits)[], + int WXUNUSED(width), int WXUNUSED(height), + int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY), + const char WXUNUSED(maskBits)[], + wxColour *WXUNUSED(fg), wxColour *WXUNUSED(bg)) { wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") ); } #if wxUSE_IMAGE -wxCursor::wxCursor( const wxImage & image ) +wxCursor::wxCursor( const wxImage & WXUNUSED(image) ) { wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") ); } @@ -142,17 +143,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); }