X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/x11/cursor.h diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index e259aa1773..3a22621bd1 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/x11/cursor.h // Purpose: wxCursor class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "cursor.h" -#endif - #include "wx/bitmap.h" #if wxUSE_IMAGE @@ -26,24 +22,21 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursor: public wxObject +class WXDLLIMPEXP_CORE wxCursor: public wxObject { 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; - bool operator != ( const wxCursor& cursor ) const; - bool Ok() const; + virtual ~wxCursor(); + bool Ok() const { return IsOk(); } + bool IsOk() const; // implementation @@ -55,4 +48,4 @@ private: #endif -// _WX_CURSOR_H_ + // _WX_CURSOR_H_