X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/cocoa/cursor.h diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index fc59048635..e3b3f09ca5 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_ @@ -14,12 +14,8 @@ #include "wx/bitmap.h" -class WXDLLEXPORT wxCursorRefData: public wxObjectRefData +class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData { - DECLARE_NO_COPY_CLASS(wxCursorRefData) - - friend class WXDLLEXPORT wxBitmap; - friend class WXDLLEXPORT wxCursor; public: wxCursorRefData(); virtual ~wxCursorRefData(); @@ -27,41 +23,43 @@ public: protected: int m_width, m_height; WX_NSCursor m_hCursor; + + friend class WXDLLIMPEXP_FWD_CORE wxBitmap; + friend class WXDLLIMPEXP_FWD_CORE wxCursor; + + wxDECLARE_NO_COPY_CLASS(wxCursorRefData); }; #define M_CURSORDATA ((wxCursorRefData *)m_refData) #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) // Cursor -class WXDLLEXPORT wxCursor: public wxBitmap +class WXDLLIMPEXP_CORE wxCursor: public wxBitmap { - DECLARE_DYNAMIC_CLASS(wxCursor) - public: - wxCursor(); - - wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL); + wxCursor(); - wxCursor(const wxString& name, long flags = 0, - int hotSpotX = 0, int hotSpotY = 0); + wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); - wxCursor(int cursor_type); - virtual ~wxCursor(); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif + virtual ~wxCursor(); - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return m_refData ; } + // FIXME: operator==() is wrong! + bool operator==(const wxCursor& cursor) const { return m_refData == cursor.m_refData; } + bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); } - 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); - } + WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; } +private: + void InitFromStock(wxStockCursor); + DECLARE_DYNAMIC_CLASS(wxCursor) }; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); +extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); -#endif // _WX_COCOA_CURSOR_H_ +#endif + // _WX_COCOA_CURSOR_H_