X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..0e4a6d339ad982453af57a590c3bf08f70dbd165:/include/wx/gtk1/cursor.h?ds=sidebyside diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h index 2612a6c8d2..15b041183f 100644 --- a/include/wx/gtk1/cursor.h +++ b/include/wx/gtk1/cursor.h @@ -2,7 +2,6 @@ // Name: wx/gtk1/cursor.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,13 +24,25 @@ 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 ); #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 ); + const char maskBits[] = NULL, + const wxColour* fg = NULL, const wxColour* bg = NULL); + + /* WARNING: the following ctor is missing: + + wxCursor(const wxString& name, + wxBitmapType type = wxCURSOR_DEFAULT_TYPE, + int hotSpotX = 0, int hotSpotY = 0); + */ + virtual ~wxCursor(); // implementation @@ -39,6 +50,8 @@ public: GdkCursor *GetCursor() const; protected: + void InitFromStock(wxStockCursor); + virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;