X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/cursor.h diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h index b760e0b512..655103113a 100644 --- a/include/wx/gtk/cursor.h +++ b/include/wx/gtk/cursor.h @@ -2,17 +2,16 @@ // Name: cursor.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKCURSORH__ #define __GTKCURSORH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -20,13 +19,9 @@ #include "wx/object.h" #include "wx/gdicmn.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxWindow; - -class wxCursor; +#if wxUSE_IMAGE +#include "wx/image.h" +#endif //----------------------------------------------------------------------------- // wxCursor @@ -34,28 +29,29 @@ class wxCursor; class wxCursor: public wxObject { - DECLARE_DYNAMIC_CLASS(wxCursor) +public: - public: - - wxCursor(void); + wxCursor(); wxCursor( int cursorId ); wxCursor( const wxCursor &cursor ); - wxCursor( const wxCursor *cursor ); - ~wxCursor(void); +#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 ); - bool operator != ( const wxCursor& cursor ); - bool Ok(void) const; - - private: - public: - - friend wxWindow; - - GdkCursor *GetCursor(void) const; - - // no data :-) + bool operator == ( const wxCursor& cursor ) const; + bool operator != ( const wxCursor& cursor ) const; + bool Ok() const; + + // implementation + + GdkCursor *GetCursor() const; + +private: + DECLARE_DYNAMIC_CLASS(wxCursor) }; #endif // __GTKCURSORH__