X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b668a73527cd08aae1321bfb1c604c9b96fffbed..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/mac/choice.h diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index 01faf5e769..998f06d203 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -18,7 +18,7 @@ #include "wx/control.h" - #include + #include "wx/dynarray.h" WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; @@ -64,7 +64,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase virtual int FindString(const wxString& s) const; virtual wxString GetString(int n) const ; virtual void SetString( int , const wxString& s ) ; - void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; /* virtual void Append(const wxString& item); @@ -78,11 +78,12 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase // Mac specific virtual void Command(wxCommandEvent& event); - void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; 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 ); @@ -93,7 +94,7 @@ protected: wxArrayString m_strings; wxChoiceDataArray m_datas ; - MenuHandle m_macPopUpMenuHandle ; + WXHMENU m_macPopUpMenuHandle ; }; #endif