X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d921af5140af576cf7651d4f47d5dc00a83e37f5..8b0f8432d72fc44aa7247ab1c19c04103323feea:/include/wx/mac/cursor.h diff --git a/include/wx/mac/cursor.h b/include/wx/mac/cursor.h index bffacb52ed..c8414a4ee0 100644 --- a/include/wx/mac/cursor.h +++ b/include/wx/mac/cursor.h @@ -12,7 +12,7 @@ #ifndef _WX_CURSOR_H_ #define _WX_CURSOR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "cursor.h" #endif @@ -56,13 +56,15 @@ public: const char maskBits[] = NULL); wxCursor(const wxImage & image) ; - + wxCursor(const char **bits) ; + wxCursor(char **bits) ; wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE, - int hotSpotX = 0, int hotSpotY = 0); + int hotSpotX = 0, int hotSpotY = 0); wxCursor(int cursor_type); ~wxCursor(); + bool CreateFromXpm(const char **bits) ; virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; } inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }