check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index f6cb3ddfa36485129c0476fbbe2404363f4da52d..e8f64259474e6b51c9d6be7c30cd9f6b1bd6c799 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -24,47 +24,34 @@
 #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 wxCursor;
 
     friend class wxCursor;
 

+    DECLARE_NO_COPY_CLASS(wxCursorRefData)
+

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

+#if wxMAC_USE_COCOA
+    WX_NSCursor m_hCursor;
+#else

     WXHCURSOR     m_hCursor;
     bool        m_disposeHandle;
     bool        m_releaseHandle;
     bool        m_isColorCursor;
     long        m_themeCursor;
     WXHCURSOR     m_hCursor;
     bool        m_disposeHandle;
     bool        m_releaseHandle;
     bool        m_isColorCursor;
     long        m_themeCursor;

+#endif

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

-const short kwxCursorBullseye = 0;
-const short kwxCursorBlank = 1;
-const short kwxCursorPencil = 2;
-const short kwxCursorMagnifier = 3;
-const short kwxCursorNoEntry = 4;
-const short kwxCursorPaintBrush = 5;
-const short kwxCursorPointRight = 6;
-const short kwxCursorPointLeft = 7;
-const short kwxCursorQuestionArrow = 8;
-const short kwxCursorRightArrow = 9;
-const short kwxCursorSizeNS = 10;
-const short kwxCursorSize = 11;
-const short kwxCursorSizeNESW = 12;
-const short kwxCursorSizeNWSE = 13;
-const short kwxCursorRoller = 14;
-const short kwxCursorLast = kwxCursorRoller;
-
-Cursor gMacCursors[kwxCursorLast+1] =
+ClassicCursor gMacCursors[kwxCursorLast+1] =

 {
 
 {
 {
 
 {


@@ -191,6 +178,7 @@ Cursor gMacCursors[kwxCursorLast+1] =
 
 wxCursor    gMacCurrentCursor ;
 
 
 wxCursor    gMacCurrentCursor ;
 

+#if !wxMAC_USE_COCOA

 CursHandle wxGetStockCursor( int number )
 {
     wxASSERT_MSG( number >= 0 && number <=kwxCursorLast , wxT("invalid stock cursor id") ) ;
 CursHandle wxGetStockCursor( int number )
 {
     wxASSERT_MSG( number >= 0 && number <=kwxCursorLast , wxT("invalid stock cursor id") ) ;


@@ -206,20 +194,26 @@ CursHandle wxGetStockCursor( int number )
 #endif
     return c ;
 }
 #endif
     return c ;
 }

+#endif

 
 wxCursorRefData::wxCursorRefData()
 {
 
 wxCursorRefData::wxCursorRefData()
 {

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

     m_hCursor = NULL;
     m_hCursor = NULL;

+#if wxMAC_USE_COCOA
+#else

     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = false;
     m_themeCursor = -1;
     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = false;
     m_themeCursor = -1;

+#endif

 }
 
 wxCursorRefData::~wxCursorRefData()
 {
 }
 
 wxCursorRefData::~wxCursorRefData()
 {

+#if wxMAC_USE_COCOA
+    if ( m_hCursor )
+        wxMacCocoaRelease(m_hCursor);
+#else

     if ( m_isColorCursor )
     {
 #ifndef __LP64__
     if ( m_isColorCursor )
     {
 #ifndef __LP64__


@@ -235,6 +229,7 @@ wxCursorRefData::~wxCursorRefData()
         // we don't release the resource since it may already
         // be in use again
     }
         // we don't release the resource since it may already
         // be in use again
     }

+#endif

 }
 
 wxCursor::wxCursor()
 }
 
 wxCursor::wxCursor()


@@ -284,9 +279,14 @@ WXHCURSOR wxCursor::GetHCURSOR() const
 
 bool wxCursor::IsOk() const
 {
 
 bool wxCursor::IsOk() const
 {

+#if wxMAC_USE_COCOA
+    return GetHCURSOR() != NULL;
+#else

     return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ;
     return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ;

+#endif

 }
 
 }
 

+#if !wxMAC_USE_COCOA

 short GetCTabIndex( CTabHandle colors , RGBColor *col )
 {
     short retval = 0 ;
 short GetCTabIndex( CTabHandle colors , RGBColor *col )
 {
     short retval = 0 ;


@@ -307,19 +307,28 @@ short GetCTabIndex( CTabHandle colors , RGBColor *col )
 
     return retval ;
 }
 
     return retval ;
 }

+#endif

 
 #if wxUSE_IMAGE
 
 void wxCursor::CreateFromImage(const wxImage & image)
 {
     m_refData = new wxCursorRefData;
 
 #if wxUSE_IMAGE
 
 void wxCursor::CreateFromImage(const wxImage & image)
 {
     m_refData = new wxCursorRefData;

-
+    int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+#if wxMAC_USE_COCOA
+    wxBitmap bmp( image );
+    CGImageRef cgimage = wxMacCreateCGImageFromBitmap(bmp);
+    if ( cgimage )
+    {
+        M_CURSORDATA->m_hCursor = wxMacCocoaCreateCursorFromCGImage( cgimage, hotSpotX, hotSpotY ); 
+        CFRelease( cgimage );
+    }
+#else

 #ifndef __LP64__
     int w = 16;
     int h = 16;
 
 #ifndef __LP64__
     int w = 16;
     int h = 16;
 

-    int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
-    int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);

     int image_w = image.GetWidth();
     int image_h = image.GetHeight();
 
     int image_w = image.GetWidth();
     int image_h = image.GetHeight();
 


@@ -446,7 +455,7 @@ void wxCursor::CreateFromImage(const wxImage & image)
     M_CURSORDATA->m_hCursor = ch ;
     M_CURSORDATA->m_isColorCursor = true ;
 #endif
     M_CURSORDATA->m_hCursor = ch ;
     M_CURSORDATA->m_isColorCursor = true ;
 #endif

-
+#endif

 }
 
 #endif //wxUSE_IMAGE
 }
 
 #endif //wxUSE_IMAGE


@@ -456,6 +465,9 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
     m_refData = new wxCursorRefData;
     if ( flags == wxBITMAP_TYPE_MACCURSOR_RESOURCE )
     {
     m_refData = new wxCursorRefData;
     if ( flags == wxBITMAP_TYPE_MACCURSOR_RESOURCE )
     {

+#if wxMAC_USE_COCOA
+        wxFAIL_MSG( wxT("Not implemented") );
+#else

 #ifndef __LP64__
         Str255 theName ;
         wxMacStringToPascal( cursor_file , theName ) ;
 #ifndef __LP64__
         Str255 theName ;
         wxMacStringToPascal( cursor_file , theName ) ;


@@ -489,6 +501,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
                     M_CURSORDATA->m_releaseHandle = true ;
             }
         }
                     M_CURSORDATA->m_releaseHandle = true ;
             }
         }

+#endif

 #endif
     }
     else
 #endif
     }
     else


@@ -512,7 +525,9 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
 wxCursor::wxCursor(int cursor_type)
 {
     m_refData = new wxCursorRefData;
 wxCursor::wxCursor(int cursor_type)
 {
     m_refData = new wxCursorRefData;

-
+#if wxMAC_USE_COCOA
+    M_CURSORDATA->m_hCursor = wxMacCocoaCreateStockCursor( cursor_type );
+#else

     switch (cursor_type)
     {
     case wxCURSOR_COPY_ARROW:
     switch (cursor_type)
     {
     case wxCURSOR_COPY_ARROW:


@@ -615,11 +630,16 @@ wxCursor::wxCursor(int cursor_type)
 
     if ( M_CURSORDATA->m_themeCursor == -1 )
         M_CURSORDATA->m_releaseHandle = true;
 
     if ( M_CURSORDATA->m_themeCursor == -1 )
         M_CURSORDATA->m_releaseHandle = true;

+#endif

 }
 
 void wxCursor::MacInstall() const
 {
     gMacCurrentCursor = *this ;
 }
 
 void wxCursor::MacInstall() const
 {
     gMacCurrentCursor = *this ;

+#if wxMAC_USE_COCOA
+    if ( IsOk() )
+        wxMacCocoaSetCursor( M_CURSORDATA->m_hCursor );
+#else

     if ( m_refData && M_CURSORDATA->m_themeCursor != -1 )
     {
         SetThemeCursor( M_CURSORDATA->m_themeCursor ) ;
     if ( m_refData && M_CURSORDATA->m_themeCursor != -1 )
     {
         SetThemeCursor( M_CURSORDATA->m_themeCursor ) ;


@@ -637,6 +657,7 @@ void wxCursor::MacInstall() const
     {
         SetThemeCursor( kThemeArrowCursor ) ;
     }
     {
         SetThemeCursor( kThemeArrowCursor ) ;
     }

+#endif

 }
 
 wxCursor::~wxCursor()
 }
 
 wxCursor::~wxCursor()