X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4f392ea20e048c68626a14181cbf78c8baff3a5..51181d291194b7ae616cfb17c984fd8927e4a977:/include/wx/gtk/cursor.h?ds=sidebyside diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index c721480dde..7c2021b8ad 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -11,6 +11,7 @@ #define _WX_GTK_CURSOR_H_ #include "wx/gdiobj.h" +#include "wx/gdicmn.h" class WXDLLIMPEXP_FWD_CORE wxColour; class WXDLLIMPEXP_FWD_CORE wxImage; @@ -23,14 +24,20 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: wxCursor(); - wxCursor( wxStockCursor 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, + wxCursor( const char bits[], int width, int height, + int hotSpotX = -1, int hotSpotY = -1, const char maskBits[] = NULL, - const wxColour *fg = NULL, const wxColour *bg = NULL ); + const wxColour* fg = NULL, const wxColour* bg = NULL); + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); virtual ~wxCursor(); // implementation @@ -38,6 +45,8 @@ public: GdkCursor *GetCursor() const; protected: + void InitFromStock(wxStockCursor); + virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;