corrected a target name

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

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index f37bf2d0fde45ecc451beca054800282f9b9dacc..bd054b08894c9d9e9d6b8038fd000af850e81f53 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -6,19 +6,15 @@
 // Created:     2002/11/27
 // RCS-ID:      
 // Copyright:   (c) David Elliott
 // Created:     2002/11/27
 // RCS-ID:      
 // Copyright:   (c) David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
 #define _WX_COCOA_CURSOR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_CURSOR_H_
 #define _WX_COCOA_CURSOR_H_
 

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

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
+class WXDLLEXPORT wxCursorRefData: public wxObjectRefData

 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
         
 {
     DECLARE_NO_COPY_CLASS(wxCursorRefData)
         


@@ -29,6 +25,8 @@ public:
     ~wxCursorRefData();
 
 protected:
     ~wxCursorRefData();
 
 protected:

+    int m_width, m_height;
+    WX_NSCursor m_hCursor;

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -42,11 +40,6 @@ class WXDLLEXPORT wxCursor: public wxBitmap
 public:
   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);
 


@@ -58,9 +51,13 @@ public:
 
   virtual bool Ok() const { return m_refData ; }
 
 
   virtual bool Ok() 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) { 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; }
+  
+  inline WX_NSCursor GetNSCursor() const
+  {    
+    return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
+  }

 
 };
 
 
 };