From 179c2d913671b785ca9c9982bb753aa0817e5182 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 10 Jan 2009 09:45:16 +0000 Subject: [PATCH] adding open and close hand cursor constants, implementation currently OSX only, closes #10360 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gdicmn.h | 8 ++++++++ src/osx/carbon/cursor.cpp | 8 ++++++++ src/osx/carbon/utilscocoa.mm | 10 +++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 4c546d93cb..38fb431a52 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -128,6 +128,14 @@ enum wxStockCursor #ifdef __WXMAC__ wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow #endif +#ifdef __WXMAC__ + wxCURSOR_OPEN_HAND, + wxCURSOR_CLOSED_HAND, +#else + // TODO CS supply openhand and closedhand cursors + wxCURSOR_OPEN_HAND = wxCURSOR_HAND, + wxCURSOR_CLOSED_HAND = wxCURSOR_HAND, +#endif #ifdef __X__ // Not yet implemented for Windows wxCURSOR_CROSS_REVERSE, diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 6cfcea3704..751ea2b6f7 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -647,6 +647,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: diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index 9420e4c9ac..b9f214dee2 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -224,7 +224,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type ) case wxCURSOR_HAND: cursor = [[NSCursor pointingHandCursor] retain]; break; - + case wxCURSOR_BULLSEYE: cursor = wxGetStockCursor(kwxCursorBullseye); break; @@ -269,6 +269,14 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type ) cursor = wxGetStockCursor(kwxCursorRoller); break; + case wxCURSOR_OPEN_HAND: + cursor = [[NSCursor openHandCursor] retain]; + break; + + case wxCURSOR_CLOSED_HAND: + cursor = [[NSCursor closedHandCursor] retain]; + break; + case wxCURSOR_CHAR: case wxCURSOR_ARROW: case wxCURSOR_LEFT_BUTTON: -- 2.45.2