X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93e73c740e6cdd6d498439aeb731fe5f3e75ea8d..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/motif/cursor.h diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h index 87a19dadc9..d5ccf28f7a 100644 --- a/include/wx/motif/cursor.h +++ b/include/wx/motif/cursor.h @@ -12,7 +12,7 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "cursor.h" #endif @@ -32,8 +32,9 @@ public: // Copy constructors wxCursor(const wxCursor& cursor) { Ref(cursor); } - wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL); + wxCursor(const char bits[], int width, int height, + int hotSpotX = -1, int hotSpotY = -1, + const char maskBits[] = NULL); wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM, int hotSpotX = 0, int hotSpotY = 0); @@ -58,6 +59,11 @@ public: // Create/get a cursor for the current display WXCursor GetXCursor(WXDisplay* display) ; private: + void Create(const char bits[], int width, int height, + int hotSpotX = -1, int hotSpotY = -1, + const char maskBits[] = NULL); + void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY); + // Make a cursor from standard id WXCursor MakeCursor(WXDisplay* display, wxStockCursor id); };