X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..a811affe70feeb727bf7fbd2748a48ded6ec3b9b:/include/wx/mac/choice.h?ds=inline diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 82c7a52228..a122f95f37 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -12,7 +12,7 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "choice.h" #endif @@ -93,7 +93,8 @@ protected: virtual wxClientData* DoGetItemClientObject( int n ) const; // free all memory we have (used by Clear() and dtor) - void Free(); + // prevent collision with some BSD definitions of macro Free() + void FreeData(); wxArrayString m_strings; wxChoiceDataArray m_datas ;