X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..b867ed682da3e66894e748628ff95cdba68023bc:/include/wx/mac/choice.h?ds=sidebyside diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h index af4bbac627..86419c148b 100644 --- a/include/wx/mac/choice.h +++ b/include/wx/mac/choice.h @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHOICE_H_ @@ -20,7 +20,7 @@ #include "wx/dynarray.h" -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; @@ -67,7 +67,7 @@ public: virtual int FindString(const wxString& s) const; virtual wxString GetString(int n) const ; virtual void SetString( int , const wxString& s ) ; - void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; /* virtual void Append(const wxString& item); @@ -81,7 +81,7 @@ public: // Mac specific virtual void Command(wxCommandEvent& event); - void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; virtual inline int GetColumns() const { return 1 ; }; */ @@ -98,8 +98,8 @@ protected: wxArrayString m_strings; wxChoiceDataArray m_datas ; - WXHMENU m_macPopUpMenuHandle ; + WXHMENU m_macPopUpMenuHandle ; }; #endif - // _WX_CHOICE_H_ + // _WX_CHOICE_H_