Fixed some styling bugs, optimized resize for large files

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

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index ec69b64c02f7696127cd03248d5996ff637c25df..25bd5514552368c1e7e1c35c4805e80a937c5f1d 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -6,16 +6,12 @@
 // 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"
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 #include "wx/bitmap.h"
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData


@@ -30,6 +26,7 @@ public:
 
 protected:
     int m_width, m_height;
 
 protected:
     int m_width, m_height;

+    WX_NSCursor m_hCursor;

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


@@ -60,8 +57,13 @@ public:
   virtual bool Ok() const { return m_refData ; }
 
   inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
   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);
+  }

 
 };
 
 
 };