corrected/removed forward declarations

[wxWidgets.git] / include / wx / cocoa / cursor.h

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index 25bd5514552368c1e7e1c35c4805e80a937c5f1d..f7c5b65ab0abaafd124f5c60b23c363de17409fe 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/cocoa/cursor.h
 // Purpose:     wxCursor class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (c) David Elliott
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
@@ -17,12 +17,12 @@
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
-        
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
+
+    friend class WXDLLIMPEXP_FWD_CORE wxBitmap;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
 protected:
     int m_width, m_height;
@@ -40,11 +40,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);
 
@@ -52,16 +47,16 @@ public:
    int hotSpotX = 0, int hotSpotY = 0);
 
   wxCursor(int cursor_type);
-  ~wxCursor();
+  virtual ~wxCursor();
 
-  virtual bool Ok() const { return m_refData ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return m_refData ; }
 
-  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; }
-  
+
   inline WX_NSCursor GetNSCursor() const
-  {    
+  {
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
   }
 
@@ -69,4 +64,5 @@ public:
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
-#endif // _WX_COCOA_CURSOR_H_
+#endif
+    // _WX_COCOA_CURSOR_H_