X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..68fe70ea1f131471b82747ee2759dba7a19a0c23:/include/wx/msw/cursor.h diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 66f082b141..19423ecffe 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -12,43 +12,33 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "cursor.h" -#endif - #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 wxCursor& cursor) { Ref(cursor); } 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(); - wxCursor& operator=(const wxCursor& cursor) - { if (*this == cursor) return (*this); Ref(cursor); return *this; } - - bool operator==(const wxCursor& cursor) const; - bool operator!=(const wxCursor& cursor) const - { return !(*this == cursor); } - // implementation only void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); } WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); } protected: + void InitFromStock(wxStockCursor); + virtual wxGDIImageRefData *CreateData() const; private: