X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..69c928ef472f89987f95e2fa798e2ba2d23eaf31:/include/wx/mac/classic/cursor.h

diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h
index 2ceb41e993..c4c0546769 100644
--- a/include/wx/mac/classic/cursor.h
+++ b/include/wx/mac/classic/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/mac/classic/cursor.h
 // Purpose:     wxCursor class
 // Author:      Stefan Csomor
 // Modified by:
@@ -17,12 +17,12 @@
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
-        
+
     friend class WXDLLEXPORT wxBitmap;
     friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
 protected:
     WXHCURSOR     m_hCursor;
@@ -43,11 +43,6 @@ class WXDLLEXPORT wxCursor: public wxBitmap
 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);
 
@@ -58,12 +53,12 @@ public:
         int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);
-  ~wxCursor();
+  virtual ~wxCursor();
 
-	bool CreateFromXpm(const char **bits) ;
-  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
+  bool CreateFromXpm(const char **bits) ;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() 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) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }