X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69b85ca49b0ac601c285e84294ac50be9dfc5291..f148f2bac3fb0fa6d984050fb940112da150aeff:/include/wx/mac/choice.h?ds=inline diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 3f9909e031..26ac3359c0 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif @@ -72,11 +72,14 @@ public: protected: virtual wxSize DoGetBestSize() const ; + +public: // for wxComboBox only virtual void DoSetItemClientData( int n, void* clientData ); virtual void* DoGetItemClientData( int n ) const; virtual void DoSetItemClientObject( int n, wxClientData* clientData ); virtual wxClientData* DoGetItemClientObject( int n ) const; +protected: // free all memory we have (used by Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData();