X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e876d0f262aa7db7a476946a63fb98fa5b4c5e5b..ff534ba469473a9ace193e736ca131144df307f9:/src/osx/carbon/cursor.cpp?ds=sidebyside diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index cc6358b4a7..fba9efb8f5 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -196,6 +196,14 @@ ClassicCursor gMacCursors[kwxCursorLast+1] = {0x000A, 0x0006} }, +{ +{0x07E0, 0x07E0, 0x07E0, 0x07E0, 0x0810, 0x1088, 0x1088, 0x1088, +0x1388, 0x1008, 0x1008, 0x0810, 0x07E0, 0x07E0, 0x07E0, 0x07E0}, +{0x07E0, 0x07E0, 0x07E0, 0x07E0, 0x0FF0, 0x1FF8, 0x1FF8, 0x1FF8, +0x1FF8, 0x1FF8, 0x1FF8, 0x0FF0, 0x07E0, 0x07E0, 0x07E0, 0x07E0}, +{0x0008, 0x0008} +}, + }; #endif @@ -231,14 +239,14 @@ wxCursorRefData::wxCursorRefData() #endif } -wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor) +wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor) : wxGDIRefData() { - // FIXME: need to copy the cursor m_hCursor = NULL; #if wxOSX_USE_COCOA - wxUnusedVar(cursor); + m_hCursor = (WX_NSCursor) wxMacCocoaRetain(cursor.m_hCursor); #elif wxOSX_USE_CARBON + // FIXME: need to copy the cursor m_disposeHandle = false; m_releaseHandle = false; m_isColorCursor = cursor.m_isColorCursor; @@ -519,7 +527,7 @@ wxCursor::wxCursor(const wxString& cursor_file, wxBitmapType flags, int hotSpotX #if wxUSE_IMAGE wxImage image ; image.LoadFile( cursor_file, flags ) ; - if ( image.Ok() ) + if ( image.IsOk() ) { image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX ) ; image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY ) ;