X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/pickerbase.cpp?ds=sidebyside

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 797c946876..fa35329952 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -82,7 +82,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
             return false;
         }
 
-        // set the maximum lenght allowed for this textctrl.
+        // set the maximum length allowed for this textctrl.
         // This is very important since any change to it will trigger an update in
         // the m_picker; for very long strings, this real-time synchronization could
         // become a CPU-blocker and thus should be avoided.
@@ -117,14 +117,19 @@ void wxPickerBase::PostCreation()
     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);
+    // associated text control and is always at least square, unless we are
+    // explicitly using wxPB_SMALL style to force it to take as little space as
+    // possible.
+    if ( !HasFlag(wxPB_SMALL) )
+    {
+        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);