support CGGraphics Masks, switch xbm interpretation to be in line with msw

[wxWidgets.git] / src / mac / carbon / cursor.cpp

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 4f3f0d47e558d0f02f3726dbc3fb81ef0861bdad..df2b686b22a6a61ffdbda4358c809c20f82b3ba8 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
 #endif // WX_PRECOMP
 
-#include "wx/icon.h"
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/mac/private.h"
@@ -36,7 +36,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
 
 protected:
     WXHCURSOR     m_hCursor;
@@ -46,8 +46,7 @@ protected:
     long        m_themeCursor;
 };
 
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+#define M_CURSORDATA wx_static_cast(wxCursorRefData*, m_refData)
 
 const short kwxCursorBullseye = 0;
 const short kwxCursorBlank = 1;
@@ -282,7 +281,7 @@ WXHCURSOR wxCursor::GetHCURSOR() const
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
 }
 
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
 {
     return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ;
 }