Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add watch cursor to osx_cocoa

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-28 13:44:25 +00:00
parent b895498c75
commit 4c00ce28bd
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/osx/cocoa/private.h
View File

@@ -386,7 +386,8 @@ const short kwxCursorSize = 11;
const short kwxCursorSizeNESW = 12; const short kwxCursorSizeNESW = 12;
const short kwxCursorSizeNWSE = 13; const short kwxCursorSizeNWSE = 13;
const short kwxCursorRoller = 14; const short kwxCursorRoller = 14;
const short kwxCursorLast = kwxCursorRoller; const short kwxCursorWatch = 15;
const short kwxCursorLast = kwxCursorWatch;
// exposing our fallback cursor map // exposing our fallback cursor map

8
src/osx/carbon/cursor.cpp
View File

@@ -196,6 +196,14 @@ ClassicCursor gMacCursors[kwxCursorLast+1] =
{0x000A, 0x0006} {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 #endif

7
src/osx/carbon/utilscocoa.mm
View File

@@ -516,8 +516,11 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
case wxCURSOR_WATCH: case wxCURSOR_WATCH:
case wxCURSOR_WAIT: case wxCURSOR_WAIT:
// should be displayed by the system when things are running // an arrow should be displayed by the system when things are running
cursor = [[NSCursor arrowCursor] retain]; // according to the HIG
// cursor = [[NSCursor arrowCursor] retain];
// but for crossplatform compatibility we display a watch cursor
cursor = wxGetStockCursor(kwxCursorWatch);
break; break;
case wxCURSOR_IBEAM: case wxCURSOR_IBEAM: