X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7b15169f9e27a66a224ac707bea3024612dd3ea..2e49a8074e7c9179b642852ff00ed8fdf0768bb1:/src/common/pickerbase.cpp?ds=sidebyside diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index 0176c2a2a8..1d3dbbc30d 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)) @@ -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 @@ -149,7 +153,7 @@ void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event) event.Skip(); // don't leave the textctrl empty - if (m_text->GetValue().empty()) + if (m_text && m_text->GetValue().empty()) UpdateTextCtrlFromPicker(); }