X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..6b55490abdb56cd66acf9d965981c4bb4b5f2abb:/include/wx/mac/choice.h?ds=sidebyside diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 335bebd869..50a506940b 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -83,20 +83,17 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase virtual inline int GetColumns() const { return 1 ; }; */ protected: + virtual wxSize DoGetBestSize() const ; 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; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - // free all memory we have (used by Clear() and dtor) void Free(); wxArrayString m_strings; - wxChoiceDataArray m_dataArray ; + wxChoiceDataArray m_datas ; MenuHandle m_macPopUpMenuHandle ; };