X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..51810d4d7e2d0ac1fa1eba43cebff9a4f4a73acc:/include/wx/osx/carbon/cursor.h?ds=sidebyside diff --git a/include/wx/osx/carbon/cursor.h b/include/wx/osx/carbon/cursor.h index 9a7b05715a..fe0c01391c 100644 --- a/include/wx/osx/carbon/cursor.h +++ b/include/wx/osx/carbon/cursor.h @@ -20,17 +20,16 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject public: wxCursor(); - 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* const* bits); wxCursor(const wxString& name, - wxBitmapType flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, int hotSpotX = 0, int hotSpotY = 0); - wxCursor(int cursor_type); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif virtual ~wxCursor(); bool CreateFromXpm(const char* const* bits); @@ -41,6 +40,8 @@ public: WXHCURSOR GetHCURSOR() const; private: + void InitFromStock(wxStockCursor); + virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;