X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..be7a101366995b7b7bb76e3d5b1e7dd8fc9a1af8:/include/wx/gtk/cursor.h?ds=sidebyside diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index fc353d4683..655103113a 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -11,7 +11,7 @@ #ifndef __GTKCURSORH__ #define __GTKCURSORH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -19,6 +19,10 @@ #include "wx/object.h" #include "wx/gdicmn.h" +#if wxUSE_IMAGE +#include "wx/image.h" +#endif + //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- @@ -30,6 +34,12 @@ public: wxCursor(); wxCursor( int cursorId ); wxCursor( const wxCursor &cursor ); +#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;