X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..1ec4e9c2b72a01a7ba7da569e0f8d04a81aaba10:/include/wx/gtk/cursor.h diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index f4e0f4b71c..533dc49847 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/gtk/cursor.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,37 +10,49 @@ #ifndef _WX_GTK_CURSOR_H_ #define _WX_GTK_CURSOR_H_ -#include "wx/object.h" +#include "wx/gdiobj.h" +#include "wx/gdicmn.h" -class WXDLLIMPEXP_CORE wxColour; -class WXDLLIMPEXP_CORE wxImage; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxImage; //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject { public: - wxCursor(); - wxCursor( int cursorId ); + wxCursor(wxStockCursor id) { InitFromStock(id); } +#if WXWIN_COMPATIBILITY_2_8 + wxCursor(int id) { InitFromStock((wxStockCursor)id); } +#endif #if wxUSE_IMAGE wxCursor( const wxImage & image ); + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); #endif - wxCursor( const char bits[], int width, int height, - int hotSpotX=-1, int hotSpotY=-1, - const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL ); + wxCursor( const char bits[], int width, int height, + int hotSpotX = -1, int hotSpotY = -1, + const char maskBits[] = NULL, + const wxColour* fg = NULL, const wxColour* bg = NULL); virtual ~wxCursor(); - bool operator == ( const wxCursor& cursor ) const; - bool operator != ( const wxCursor& cursor ) const; - bool Ok() const { return IsOk(); } - bool IsOk() const; // implementation GdkCursor *GetCursor() const; +protected: + void InitFromStock(wxStockCursor); +#if wxUSE_IMAGE + void InitFromImage(const wxImage& image); +#endif + + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxCursor) };