X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f27b6637ae7210b7a17b2fb5869a43ee5db06a7..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/common/pickerbase.cpp?ds=sidebyside diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index cd73e10814..797c946876 100644 --- a/src/common/pickerbase.cpp +++ b/src/common/pickerbase.cpp @@ -43,13 +43,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl) -BEGIN_EVENT_TABLE(wxPickerBase, wxControl) - EVT_SIZE(wxPickerBase::OnSize) - WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase) -END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl) - - // ---------------------------------------------------------------------------- // wxPickerBase // ---------------------------------------------------------------------------- @@ -129,7 +122,7 @@ void wxPickerBase::PostCreation() const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize()); wxSize pickerMinSize; pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y); - pickerMinSize.x = wxMax(pickerMinSize.x, pickerMinSize.y); + pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y); if ( pickerMinSize != pickerBestSize ) m_picker->SetMinSize(pickerMinSize); @@ -179,11 +172,4 @@ void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &) UpdatePickerFromTextCtrl(); } -void wxPickerBase::OnSize(wxSizeEvent &event) -{ - if (GetAutoLayout()) - Layout(); - event.Skip(); -} - #endif // Any picker in use