X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7eff657c071f9df1938edb2d1b530492ccfc9489..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/cursor.h?ds=sidebyside diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index e91fc3a381..7c2021b8ad 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -7,51 +7,51 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GTK_CURSOR_H_ +#define _WX_GTK_CURSOR_H_ -#ifndef __GTKCURSORH__ -#define __GTKCURSORH__ - -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" +#include "wx/gdiobj.h" #include "wx/gdicmn.h" -#if wxUSE_IMAGE -#include "wx/image.h" -#endif +class WXDLLIMPEXP_FWD_CORE wxColour; +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 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 wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); + virtual ~wxCursor(); // implementation GdkCursor *GetCursor() const; +protected: + void InitFromStock(wxStockCursor); + + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxCursor) }; -#endif // __GTKCURSORH__ +#endif // _WX_GTK_CURSOR_H_