X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d88de032d3009be88d0f0ba4a882784aa9493331..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/os2/button.cpp?ds=inline diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 7f1caf34d4..dc33b17225 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -32,11 +32,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator* validator, +# else const wxValidator& validator, +# endif +#endif const wxString& name) { SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); +#endif m_windowStyle = style; parent->AddChild((wxButton *)this); @@ -81,7 +89,7 @@ wxSize wxButton::DoGetBestSize() wBtn += 3*wChar; // the button height is proportional to the height of the font used - int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); + int hBtn = 0;// TODO: BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); return wxSize(wBtn, hBtn); }