X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ea6cbf486a3be57fd10283b3cd65a34e193d3d6c:/include/wx/mac/carbon/cursor.h diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index def15d07ba..a9248f7e90 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: @@ -15,46 +15,39 @@ #include "wx/bitmap.h" // Cursor -class WXDLLEXPORT wxCursor: public wxBitmap +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxCursor) - public: - wxCursor(); - - // Copy constructors - wxCursor(const wxCursor& cursor) - : wxBitmap() - { Ref(cursor); } + wxCursor(); - wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL); + wxCursor(const char bits[], int width, int height, + int hotSpotX = -1, int hotSpotY = -1, + const char maskBits[] = NULL); wxCursor(const wxImage & image) ; - wxCursor(const char **bits) ; - wxCursor(char **bits) ; + wxCursor(const char* const* bits); wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE, - int hotSpotX = 0, int hotSpotY = 0); - - wxCursor(int cursor_type); - ~wxCursor(); + int hotSpotX = 0, int hotSpotY = 0); - bool CreateFromXpm(const char **bits) ; - virtual bool Ok() const ; + wxCursor(int cursor_type); + virtual ~wxCursor(); - 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; } + bool CreateFromXpm(const char* const* bits); void MacInstall() const ; - void SetHCURSOR(WXHCURSOR cursor); - inline WXHCURSOR GetHCURSOR() const ; -private : + void SetHCURSOR(WXHCURSOR cursor); + WXHCURSOR GetHCURSOR() const; + +private: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + void CreateFromImage(const wxImage & image) ; + + DECLARE_DYNAMIC_CLASS(wxCursor) }; -extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); +extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); -#endif - // _WX_CURSOR_H_ +#endif // _WX_CURSOR_H_