X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/063864481a2c872076cf4dd335008da990f66fdb..488b2c29c0cf468f96f148003b21952611325dbf:/src/cocoa/cursor.mm diff --git a/src/cocoa/cursor.mm b/src/cocoa/cursor.mm index c7535c4d0a..b8eee50500 100644 --- a/src/cocoa/cursor.mm +++ b/src/cocoa/cursor.mm @@ -21,7 +21,7 @@ #import #import -#include +#include "wx/cocoa/string.h" #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) @@ -31,7 +31,7 @@ typedef struct tagClassicCursor { wxUint16 bits[16]; wxUint16 mask[16]; - wxUint16 hotspot[2]; + wxInt16 hotspot[2]; }ClassicCursor; const short kwxCursorBullseye = 0 ; @@ -216,8 +216,8 @@ NSCursor* wxGetStockCursor( short sIndex ) //do the rest of those bits and alphas :) for (int shift = 0; shift < 32; ++shift) { - data[i] |= (!!(pCursor->bits[i] & (1 << (shift >> 1) ))) << shift; - data[i] |= (!(pCursor->mask[i] & (1 << (shift >> 1) ))) << ++shift; + data[i] |= ( !!( (pCursor->mask[i] & (1 << (shift >> 1) )) ) ) << shift; + data[i] |= ( !( (pCursor->bits[i] & (1 << (shift >> 1) )) ) ) << ++shift; } } @@ -226,7 +226,7 @@ NSCursor* wxGetStockCursor( short sIndex ) //create the new cursor NSCursor* theCursor = [[NSCursor alloc] initWithImage:theImage - hotSpot:NSMakePoint(pCursor->hotspot[0], pCursor->hotspot[1]) + hotSpot:NSMakePoint(pCursor->hotspot[1], pCursor->hotspot[0]) ]; //do the usual cleanups