X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3c861501a451503b31c075ccb59d16b0ae01e99..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/dfb/cursor.h?ds=sidebyside diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h index 298cbe0eb0..0a22bb67b8 100644 --- a/include/wx/dfb/cursor.h +++ b/include/wx/dfb/cursor.h @@ -11,38 +11,36 @@ #ifndef _WX_DFB_CURSOR_H_ #define _WX_DFB_CURSOR_H_ -#include "wx/object.h" +#include "wx/gdiobj.h" #include "wx/gdicmn.h" -class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBitmap; //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: wxCursor() {} - wxCursor(int cursorId); - 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(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif wxCursor(const wxString& name, - long flags = wxBITMAP_TYPE_CUR_RESOURCE, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, int hotSpotX = 0, int hotSpotY = 0); - bool Ok() const; - bool operator==(const wxCursor& cursor) const; - bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); } - // implementation wxBitmap GetBitmap() const; protected: + void InitFromStock(wxStockCursor); + // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; DECLARE_DYNAMIC_CLASS(wxCursor) };