X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ef5b1dad1f5d18309d0fdc0b36ad383b58f1a2e..c7e94140cd436c6c234a382ad4e16ec5da65830c:/src/motif/cursor.cpp diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 41deb27462..22646e641a 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -23,6 +23,7 @@ #include "wx/utils.h" #include "wx/window.h" #include "wx/image.h" + #include "wx/log.h" #endif #ifdef __VMS__ @@ -58,6 +59,11 @@ public: wxXCursorList m_cursors; // wxXCursor objects, one per display wxStockCursor m_cursorId; // wxWidgets standard cursor id +private: + // There is no way to copy m_cursor so we can't implement a copy ctor + // properly. + wxDECLARE_NO_COPY_CLASS(wxCursorRefData); + friend class wxCursor; }; @@ -239,13 +245,14 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap, } wxCursor::wxCursor(const char bits[], int width, int height, - int hotSpotX, int hotSpotY, const char maskBits[]) + int hotSpotX, int hotSpotY, const char maskBits[] , + const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg) ) { Create(bits, width, height, hotSpotX, hotSpotY, maskBits); } -wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX, int hotSpotY, - const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg)) +wxCursor::wxCursor(const wxString& name, wxBitmapType type, + int hotSpotX, int hotSpotY) { // Must be an XBM file if (type != wxBITMAP_TYPE_XBM) { @@ -302,9 +309,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(*wx_static_cast(const wxCursorRefData *, data)); + wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxMotif.") ); + + return new wxCursorRefData; } // Motif-specific: create/get a cursor for the current display