X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/include/wx/motif/cursor.h diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h index 2cfc1ff3d1..2ef7e2dbda 100644 --- a/include/wx/motif/cursor.h +++ b/include/wx/motif/cursor.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/motif/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(NO_GCC_PRAGMA) -#pragma interface "cursor.h" -#endif - #include "wx/object.h" #include "wx/gdicmn.h" @@ -25,31 +21,26 @@ class WXDLLEXPORT wxImage; class WXDLLEXPORT wxCursor: public wxObject { DECLARE_DYNAMIC_CLASS(wxCursor) - + public: wxCursor(); - - // Copy constructors - wxCursor(const wxCursor& cursor) { Ref(cursor); } - + wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, const char maskBits[] = NULL); - + wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM, int hotSpotX = 0, int hotSpotY = 0); -#if wxUSE_IMAGE +#if wxUSE_IMAGE wxCursor(const wxImage& image); #endif - + wxCursor(wxStockCursor id); ~wxCursor(); - + virtual bool Ok() const; - - wxCursor& operator = (const wxCursor& cursor) - { if (*this == cursor) return (*this); Ref(cursor); return *this; } + bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; } bool operator != (const wxCursor& cursor) const @@ -57,7 +48,7 @@ public: // Motif-specific. // Create/get a cursor for the current display - WXCursor GetXCursor(WXDisplay* display) ; + WXCursor GetXCursor(WXDisplay* display) const; private: void Create(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, @@ -65,7 +56,7 @@ private: void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY); // Make a cursor from standard id - WXCursor MakeCursor(WXDisplay* display, wxStockCursor id); + WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const; }; extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);