X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/x11/cursor.h diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index 51e6c60a5f..76b695a411 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -13,6 +13,8 @@ #define _WX_CURSOR_H_ #include "wx/gdiobj.h" +#include "wx/gdicmn.h" +#include "wx/colour.h" class WXDLLIMPEXP_FWD_CORE wxImage; @@ -24,14 +26,17 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: wxCursor(); - wxCursor( int cursorId ); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif #if wxUSE_IMAGE wxCursor( const wxImage & image ); #endif - wxCursor( const char bits[], int width, int height, - int hotSpotX=-1, int hotSpotY=-1, - const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 ); + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); virtual ~wxCursor(); // implementation @@ -39,6 +44,8 @@ public: WXCursor GetCursor() const; protected: + void InitFromStock(wxStockCursor); + virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;