X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/msw/cursor.h diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 24fb71f1d7..19423ecffe 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -14,22 +14,22 @@ #include "wx/msw/gdiimage.h" -class WXDLLEXPORT wxImage; +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: