X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..ba49d2acf95d53517719c4fd9ac2ad5aaa13540b:/src/x11/cursor.cpp diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp index 7eaa5e6fde..c314e4f387 100644 --- a/src/x11/cursor.cpp +++ b/src/x11/cursor.cpp @@ -41,6 +41,11 @@ public: WXCursor m_cursor; WXDisplay *m_display; + +private: + // There is no way to copy m_cursor so we can't implement a copy ctor + // properly. + wxDECLARE_NO_COPY_CLASS(wxCursorRefData); }; wxCursorRefData::wxCursorRefData() @@ -124,9 +129,9 @@ void wxCursor::InitFromStock( wxStockCursor cursorId ) #endif } -wxCursor::wxCursor(const wxString& name, - wxBitmapType type, - int hotSpotX, int hotSpotY) +wxCursor::wxCursor(const wxString& WXUNUSED(name), + wxBitmapType WXUNUSED(type), + int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY)) { wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") ); } @@ -147,9 +152,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const return new wxCursorRefData; } -wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const +wxGDIRefData * +wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const { - return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data)); + wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxX11.") ); + + return new wxCursorRefData; } WXCursor wxCursor::GetCursor() const @@ -193,7 +201,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) if (gs_busyCount++ > 0) return; - wxASSERT_MSG( !gs_savedCursor.Ok(), + wxASSERT_MSG( !gs_savedCursor.IsOk(), wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor;