check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h
index 33d8ef8cf5525eaa6a664994ea843d517479e0f9..0cc9a6800a7a01b61469d8b7d0ba6b1860d0db61 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/mac/carbon/cursor.h

 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:


@@ -34,11 +34,9 @@ public:
   wxCursor(int cursor_type);
   virtual ~wxCursor();
 
   wxCursor(int cursor_type);
   virtual ~wxCursor();
 

-       bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const ;
-
-  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; }
+  bool CreateFromXpm(const char **bits) ;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const ;

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