X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..dd021ce2bd29a7e1d19b80995cd700828d5367c3:/include/wx/os2/cursor.h?ds=sidebyside diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h index 239c87e366..02956942e2 100644 --- a/include/wx/os2/cursor.h +++ b/include/wx/os2/cursor.h @@ -6,7 +6,7 @@ // Created: 10/13/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CURSOR_H_ @@ -14,11 +14,11 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData +class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData { public: wxCursorRefData(); - ~wxCursorRefData() { Free(); } + virtual ~wxCursorRefData() { Free(); } virtual void Free(void); bool m_bDestroyCursor; }; // end of CLASS wxCursorRefData @@ -27,13 +27,11 @@ public: #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) // Cursor -class WXDLLEXPORT wxCursor: public wxBitmap +class WXDLLIMPEXP_CORE wxCursor: public wxBitmap { public: wxCursor(); - // Copy constructors - wxCursor(const wxCursor& rCursor) { Ref(rCursor); } wxCursor(const wxImage& rImage); wxCursor( const char acBits[] @@ -48,19 +46,9 @@ public: ,int nHotSpotX = 0 ,int nHotSpotY = 0 ); - wxCursor(int nCursorType); + wxCursor(wxStockCursor nCursorType); inline ~wxCursor() { } - inline wxCursor& operator = (const wxCursor& rCursor) - { - if (*this == rCursor) - return (*this); - Ref(rCursor); - return *this; - } - inline bool operator == (const wxCursor& rCursor) const { return m_refData == rCursor.m_refData; } - inline bool operator != (const wxCursor& rCursor) const { return m_refData != rCursor.m_refData; } - inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } inline void SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }