X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/x11/cursor.h?ds=sidebyside diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index e914316b8a..76b695a411 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -1,58 +1,56 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/x11/cursor.h // Purpose: wxCursor class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "cursor.h" -#endif - -#include "wx/bitmap.h" +#include "wx/gdiobj.h" +#include "wx/gdicmn.h" +#include "wx/colour.h" -#if wxUSE_IMAGE -#include "wx/image.h" -#endif +class WXDLLIMPEXP_FWD_CORE wxImage; //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- -class wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: - wxCursor(); - wxCursor( int cursorId ); - wxCursor( const wxCursor &cursor ); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif #if wxUSE_IMAGE wxCursor( const wxImage & image ); #endif - 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(); - wxCursor& operator = ( const wxCursor& cursor ); - bool operator == ( const wxCursor& cursor ) const; - bool operator != ( const wxCursor& cursor ) const; - bool Ok() const; + + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); + virtual ~wxCursor(); // implementation WXCursor GetCursor() const; +protected: + void InitFromStock(wxStockCursor); + + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxCursor) }; - -#endif -// _WX_CURSOR_H_ +#endif // _WX_CURSOR_H_