check that the version of __sync_sub_and_fetch that returns a value is supported...

[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 def15d07ba69ff841f4e7de10ab96b99ab808148..7cbe319bc63465f96809433731ffa71aa56d13f3 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:


@@ -15,18 +15,13 @@
 #include "wx/bitmap.h"
 
 // Cursor
 #include "wx/bitmap.h"
 
 // Cursor

-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLEXPORT wxCursor: public wxGDIObject

 {
   DECLARE_DYNAMIC_CLASS(wxCursor)
 
 public:
   wxCursor();
 
 {
   DECLARE_DYNAMIC_CLASS(wxCursor)
 
 public:
   wxCursor();
 

-  // Copy constructors
-  wxCursor(const wxCursor& cursor)
-      : wxBitmap()
-  { Ref(cursor); }
-

   wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
     const char maskBits[] = NULL);
 
   wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
     const char maskBits[] = NULL);
 


@@ -37,14 +32,11 @@ public:
         int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);
         int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);

-  ~wxCursor();
-
-       bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const ;
+  virtual ~wxCursor();

 
 

-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  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 ;