X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64631e82fda8fd68cd2f9ce1aba71a7e0747ba46..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/mac/carbon/cursor.h diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index 7d1cff7bbe..8cda6b0761 100644 --- a/include/wx/mac/carbon/cursor.h +++ b/include/wx/mac/carbon/cursor.h @@ -18,27 +18,6 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData -{ - DECLARE_NO_COPY_CLASS(wxCursorRefData) - - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxCursor; -public: - wxCursorRefData(); - ~wxCursorRefData(); - -protected: - WXHCURSOR m_hCursor; - bool m_disposeHandle; - bool m_releaseHandle; - bool m_isColorCursor ; - long m_themeCursor ; -}; - -#define M_CURSORDATA ((wxCursorRefData *)m_refData) -#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) - // Cursor class WXDLLEXPORT wxCursor: public wxBitmap { @@ -65,7 +44,7 @@ public: ~wxCursor(); bool CreateFromXpm(const char **bits) ; - virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; } + virtual bool Ok() 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; } @@ -74,7 +53,7 @@ public: void MacInstall() const ; void SetHCURSOR(WXHCURSOR cursor); - inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } + inline WXHCURSOR GetHCURSOR() const ; private : void CreateFromImage(const wxImage & image) ; };