X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a5325ad6728d6dbc6c2757f9ba6484bfc773fbbe:/include/wx/cocoa/cursor.h?ds=sidebyside diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index 52e8a32786..bd054b0889 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 @@ -30,6 +26,7 @@ public: protected: int m_width, m_height; + WX_NSCursor m_hCursor; }; #define M_CURSORDATA ((wxCursorRefData *)m_refData) @@ -43,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); @@ -59,9 +51,13 @@ public: 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 + { + return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); + } };