X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5558135c4894ec39d39d46a3586df2bb0e89da09..80752b57a9bbdfa7613a917d9ece00fc47677080:/include/wx/cocoa/cursor.h diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index ecb60d7329..d99375d26e 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -12,10 +12,6 @@ #ifndef _WX_COCOA_CURSOR_H_ #define _WX_COCOA_CURSOR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "cursor.h" -#endif - #include "wx/bitmap.h" class WXDLLEXPORT wxCursorRefData: public wxObjectRefData @@ -26,7 +22,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); protected: int m_width, m_height; @@ -44,11 +40,6 @@ class WXDLLEXPORT wxCursor: public wxBitmap public: wxCursor(); - // Copy constructors - wxCursor(const wxCursor& cursor) - : wxBitmap() - { Ref(cursor); } - wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, const char maskBits[] = NULL); @@ -56,13 +47,12 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); virtual bool Ok() const { return m_refData ; } - inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; } - inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; } - inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; } + inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; } + inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; } inline WX_NSCursor GetNSCursor() const {