X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..0e9cfa51093774485315ddfa53e2b16e215109c2:/include/wx/cocoa/cursor.h diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index bd054b0889..f7c5b65ab0 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/cocoa/cursor.h // Purpose: wxCursor class // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_CURSOR_H_ @@ -17,12 +17,12 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData { DECLARE_NO_COPY_CLASS(wxCursorRefData) - - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxCursor; + + friend class WXDLLIMPEXP_FWD_CORE wxBitmap; + friend class WXDLLIMPEXP_FWD_CORE wxCursor; public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); protected: int m_width, m_height; @@ -47,15 +47,16 @@ public: int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); - ~wxCursor(); + virtual ~wxCursor(); - virtual bool Ok() const { return m_refData ; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return 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); } @@ -63,4 +64,5 @@ public: extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); -#endif // _WX_COCOA_CURSOR_H_ +#endif + // _WX_COCOA_CURSOR_H_