X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c781807d89448537ba1d6d8627ff153f3ecc581a..d5cd19b45cb8ed187238a64fd6a672a2d8c98b4d:/include/wx/msw/cursor.h diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 201dcae705..66f082b141 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -12,7 +12,7 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "cursor.h" #endif @@ -20,26 +20,12 @@ class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxCursorRefData : public wxGDIImageRefData -{ -public: - wxCursorRefData(); - virtual ~wxCursorRefData() { Free(); } - - virtual void Free(); - - // for compatibility -public: - bool m_destroyCursor; -}; - // Cursor class WXDLLEXPORT wxCursor : public wxGDIImage { public: + // constructors wxCursor(); - - // Copy constructors wxCursor(const wxCursor& cursor) { Ref(cursor); } wxCursor(const wxImage& image); wxCursor(const char bits[], int width, int height, @@ -48,18 +34,22 @@ public: 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; } + 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: - virtual wxGDIImageRefData *CreateData() const { return new wxCursorRefData; } + virtual wxGDIImageRefData *CreateData() const; private: DECLARE_DYNAMIC_CLASS(wxCursor)