add src/gtk/anybutton.cpp to OpenVMS makefile

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 1d3dbbc30d1a1d4a128ecbfe3df9a20297440be2..ce17ad7da88493e00b2b2e359092f94b67421030 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -123,6 +123,16 @@ void wxPickerBase::PostCreation()
     // associated with it - in that case it defaults to 0
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
+    // 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( HasTextCtrl() ? m_text->GetBestSize() : wxSize());
+    wxSize pickerMinSize;
+    pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
+    pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y);
+    if ( pickerMinSize != pickerBestSize )
+        m_picker->SetMinSize(pickerMinSize);
+
     SetSizer(m_sizer);
 
     SetInitialSize( GetMinSize() );