X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb4b11a2199e69d0d7797af69d25aa77b9519a54..beb2638a997914bd12c55e81589adebd90af9ed2:/src/common/pickerbase.cpp

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index cccaabc42e..ec7d0a2cee 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -66,10 +66,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;
+    
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;
-
+        
+    SetMinSize( size );
+        
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
@@ -110,7 +113,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
-
+    
     return true;
 }
 
@@ -121,7 +124,8 @@ void wxPickerBase::PostCreation()
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);
-    SetMinSize( m_sizer->GetMinSize() );
+    
+    SetInitialSize( GetMinSize() );
 }
 
 #if wxUSE_TOOLTIPS