X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..31528cd3cac75558beef4bce0ba21fd182a808ab:/include/wx/msw/choice.h diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 54da088afd..7cdfa9a577 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -18,7 +18,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; // Choice item class WXDLLEXPORT wxChoice: public wxControl @@ -73,9 +73,10 @@ public: protected: int m_noStrings; + virtual wxSize DoGetBestSize(); virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + int width, int height, + int sizeFlags = wxSIZE_AUTO); }; #endif