X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..54590cb07847ca447411e8aefba0b01ccc24be22:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index bd861353d6..f1b2a9dc89 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -19,6 +19,7 @@ #include "wx/utils.h" #include "wx/icon.h" #include "wx/gdicmn.h" + #include "wx/image.h" #endif #include "wx/x11/private.h" @@ -31,7 +32,7 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData: public wxGDIRefData { public: @@ -123,15 +124,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") ); } @@ -141,19 +144,14 @@ wxCursor::~wxCursor() { } -bool wxCursor::operator == ( const wxCursor& cursor ) const +wxGDIRefData *wxCursor::CreateGDIRefData() const { - return m_refData == cursor.m_refData; + return new wxCursorRefData; } -bool wxCursor::operator != ( const wxCursor& cursor ) const +wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const { - return m_refData != cursor.m_refData; -} - -bool wxCursor::IsOk() const -{ - return (m_refData != NULL); + return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data)); } WXCursor wxCursor::GetCursor() const