Revert last change, which made it impossible to set a custom text color and then...

[wxWidgets.git] / include / wx / mac / classic / cursor.h

diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h
index c8414a4ee00c277125f5c6ad955515d79187fd73..2ceb41e9931da5117211d69bc9adb099ef8cc705 100644 (file)
--- a/include/wx/mac/classic/cursor.h
+++ b/include/wx/mac/classic/cursor.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cursor.h"
-#endif
-

 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData


@@ -68,8 +64,8 @@ public:
   virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
 
   inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
   virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
 
   inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }

-  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-  inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
+  inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
+  inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }

 
     void MacInstall() const ;
 
 
     void MacInstall() const ;