64 bit fixes

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 2dab20662aae6c162e11031a80c80a4bfb7b64c4..e8f64259474e6b51c9d6be7c30cd9f6b1bd6c799 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -24,16 +24,15 @@
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)

 
 
 
 

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

 {
 {

-    DECLARE_NO_COPY_CLASS(wxCursorRefData)
-
-    friend class wxBitmap;

     friend class wxCursor;
 
     friend class wxCursor;
 

+    DECLARE_NO_COPY_CLASS(wxCursorRefData)
+

 public:
     wxCursorRefData();
     virtual ~wxCursorRefData();
 public:
     wxCursorRefData();
     virtual ~wxCursorRefData();


@@ -199,8 +198,6 @@ CursHandle wxGetStockCursor( int number )
 
 wxCursorRefData::wxCursorRefData()
 {
 
 wxCursorRefData::wxCursorRefData()
 {

-    SetWidth( 16 );
-    SetHeight( 16 );

     m_hCursor = NULL;
 #if wxMAC_USE_COCOA
 #else
     m_hCursor = NULL;
 #if wxMAC_USE_COCOA
 #else