From 4dfa17210fc2b6586c3e60d2398575dbbe372bcd Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 13 Feb 2009 09:34:04 +0000 Subject: [PATCH] Reorder code so that you can actually set the size of a picker control at startup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/pickerbase.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp index cccaabc42e..412ddc39e0 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)) @@ -91,7 +94,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent, // the m_picker; for very long strings, this real-time synchronization could // become a CPU-blocker and thus should be avoided. // 32 characters will be more than enough for all common uses. - m_text->SetMaxLength(32); + // m_text->SetMaxLength(32); // set the initial contents of the textctrl m_text->SetValue(text); @@ -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 -- 2.45.2