X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4d592ff8d55230b46e0aec95ed4d01ea61ef86e..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/cocoa/cursor.h?ds=sidebyside diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index ec69b64c02..54209f0b19 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -1,70 +1,64 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/cocoa/cursor.h // Purpose: wxCursor class // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: // Copyright: (c) David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_CURSOR_H_ #define _WX_COCOA_CURSOR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "cursor.h" -#endif - #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(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); 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(); - // Copy constructors - wxCursor(const wxCursor& cursor) - : wxBitmap() - { Ref(cursor); } + wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); - wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL); - - wxCursor(const wxString& name, long flags = 0, - int hotSpotX = 0, int hotSpotY = 0); - - wxCursor(int cursor_type); - ~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 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 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; } + 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_