X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..6178debcd342963974dbdce6ac2ddb2fbe89e42a:/src/osx/carbon/cursor.cpp diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 6cfcea3704..fddaa09533 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -66,7 +66,7 @@ protected: friend class wxCursor; - DECLARE_NO_ASSIGN_CLASS(wxCursorRefData) + wxDECLARE_NO_ASSIGN_CLASS(wxCursorRefData); }; #define M_CURSORDATA static_cast(m_refData) @@ -233,12 +233,12 @@ wxCursorRefData::wxCursorRefData() wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor) { - // 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; @@ -281,11 +281,6 @@ wxCursor::wxCursor( const wxImage &image ) #endif } -wxCursor::wxCursor(const char* const* bits) -{ - (void) CreateFromXpm(bits); -} - wxGDIRefData *wxCursor::CreateGDIRefData() const { return new wxCursorRefData; @@ -296,20 +291,6 @@ wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const return new wxCursorRefData(*static_cast(data)); } -bool wxCursor::CreateFromXpm(const char* const* bits) -{ -#if wxUSE_IMAGE - wxCHECK_MSG( bits != NULL, false, wxT("invalid cursor data") ); - wxXPMDecoder decoder; - wxImage img = decoder.ReadData(bits); - wxCHECK_MSG( img.Ok(), false, wxT("invalid cursor data") ); - CreateFromImage( img ) ; - return true; -#else - return false; -#endif -} - WXHCURSOR wxCursor::GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); @@ -647,6 +628,14 @@ void wxCursor::InitFromStock(wxStockCursor cursor_type) M_CURSORDATA->m_hCursor = wxGetStockCursor(kwxCursorRoller); break; + case wxCURSOR_OPEN_HAND: + M_CURSORDATA->m_themeCursor = kThemeOpenHandCursor; + break; + + case wxCURSOR_CLOSED_HAND: + M_CURSORDATA->m_themeCursor = kThemeClosedHandCursor; + break; + case wxCURSOR_CHAR: case wxCURSOR_ARROW: case wxCURSOR_LEFT_BUTTON: