X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/msw/cursor.h?ds=sidebyside diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index f8025338a4..19423ecffe 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -17,19 +17,19 @@ class WXDLLIMPEXP_FWD_CORE wxImage; // Cursor -class WXDLLEXPORT wxCursor : public wxGDIImage +class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage { public: // constructors wxCursor(); wxCursor(const wxImage& image); - wxCursor(const char bits[], int width, int height, - int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL); wxCursor(const wxString& name, - long flags = wxBITMAP_TYPE_CUR_RESOURCE, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, int hotSpotX = 0, int hotSpotY = 0); - wxCursor(int idCursor); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif virtual ~wxCursor(); // implementation only @@ -37,6 +37,8 @@ public: WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); } protected: + void InitFromStock(wxStockCursor); + virtual wxGDIImageRefData *CreateData() const; private: