X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..687b91d266990129fbbb8c21d92fa4298b458352:/include/wx/mac/carbon/cursor.h diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index 8cda6b0761..2495246c57 100644 --- a/include/wx/mac/carbon/cursor.h +++ b/include/wx/mac/carbon/cursor.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/mac/carbon/cursor.h // Purpose: wxCursor class // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "cursor.h" -#endif - #include "wx/bitmap.h" // Cursor @@ -26,11 +22,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); @@ -41,12 +32,12 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); - bool CreateFromXpm(const char **bits) ; - virtual bool Ok() const ; + bool CreateFromXpm(const char **bits) ; + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const ; - inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; } 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; }