Fix typo in last commit

[wxWidgets.git] / src / common / pickerbase.cpp

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 81583028ac5592110f1163592ef9b367c8068d24..797c946876f5849f88ccf4dfc99c5d74b19fdeb4 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
@@ -126,10 +119,10 @@ void wxPickerBase::PostCreation()
     // For aesthetic reasons, make sure the picker is at least as high as the
     // associated text control and is always at least square.
     const wxSize pickerBestSize(m_picker->GetBestSize());
-    const wxSize textBestSize(m_text->GetBestSize());
+    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