X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/mgl/cursor.h?ds=sidebyside diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h index 5a0c378bac..bba7e590f2 100644 --- a/include/wx/mgl/cursor.h +++ b/include/wx/mgl/cursor.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/mgl/cursor.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -10,8 +10,7 @@ #ifndef __WX_CURSOR_H__ #define __WX_CURSOR_H__ -#include "wx/defs.h" -#include "wx/object.h" +#include "wx/gdiobj.h" #include "wx/gdicmn.h" class MGLCursor; @@ -20,27 +19,26 @@ class MGLCursor; // wxCursor //----------------------------------------------------------------------------- -class WXDLLEXPORT 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); virtual ~wxCursor(); - bool operator == (const wxCursor& cursor) const; - bool operator != (const wxCursor& cursor) const; - bool Ok() const; // implementation MGLCursor *GetMGLCursor() const; private: + void InitFromStock(wxStockCursor); + DECLARE_DYNAMIC_CLASS(wxCursor) };