X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0f3867a6a0cd50b878e9b2ea502616e59e19b99..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/cursor.h diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 6d5c213f8a..f8025338a4 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -12,70 +12,32 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#ifdef __GNUG__ - #pragma interface "cursor.h" -#endif - -// compatible (even if incorrect) behaviour by default: derive wxCursor from -// wxBitmap -#ifndef wxICON_IS_BITMAP - #define wxICON_IS_BITMAP 0 -#endif - -#if wxICON_IS_BITMAP - #include "wx/bitmap.h" - - #define wxCursorRefDataBase wxBitmapRefData - #define wxCursorBase wxBitmap -#else - #include "wx/msw/gdiimage.h" - - #define wxCursorRefDataBase wxGDIImageRefData - #define wxCursorBase wxGDIImage -#endif - -class WXDLLEXPORT wxImage; +#include "wx/msw/gdiimage.h" -class WXDLLEXPORT wxCursorRefData : public wxCursorRefDataBase -{ -public: - wxCursorRefData(); - virtual ~wxCursorRefData() { Free(); } - - virtual void Free(); - - // for compatibility -public: - bool m_destroyCursor; -}; +class WXDLLIMPEXP_FWD_CORE wxImage; // Cursor -class WXDLLEXPORT wxCursor : public wxCursorBase +class WXDLLEXPORT wxCursor : public wxGDIImage { public: + // constructors wxCursor(); - - // Copy constructors - wxCursor(const wxCursor& cursor) { Ref(cursor); } - wxCursor(const wxImage & image) ; + 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, int hotSpotX = 0, int hotSpotY = 0); - wxCursor(int cursor_type); + wxCursor(int idCursor); virtual ~wxCursor(); - wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; } - bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; } - bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; } - + // implementation only void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); } WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); } protected: - virtual wxGDIImageRefData *CreateData() const { return new wxCursorRefData; } + virtual wxGDIImageRefData *CreateData() const; private: DECLARE_DYNAMIC_CLASS(wxCursor)