Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder code so that you can actually set the size of a picker control at startup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-02-13 09:34:04 +00:00
parent 34da808e3f
commit 4dfa17210f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/pickerbase.cpp
View File

@@ -66,10 +66,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
// remove any border style from our style as wxPickerBase's window must be // 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) // invisible (user styles must be set on the textctrl or the platform-dependent picker)
style &= ~wxBORDER_MASK; style &= ~wxBORDER_MASK;
if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL, if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
validator, name)) validator, name))
return false; return false;
SetMinSize( size );
m_sizer = new wxBoxSizer(wxHORIZONTAL); m_sizer = new wxBoxSizer(wxHORIZONTAL);
if (HasFlag(wxPB_USE_TEXTCTRL)) 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 // the m_picker; for very long strings, this real-time synchronization could
// become a CPU-blocker and thus should be avoided. // become a CPU-blocker and thus should be avoided.
// 32 characters will be more than enough for all common uses. // 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 // set the initial contents of the textctrl
m_text->SetValue(text); m_text->SetValue(text);
@@ -121,7 +124,8 @@ void wxPickerBase::PostCreation()
m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5); m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
SetSizer(m_sizer); SetSizer(m_sizer);
SetMinSize( m_sizer->GetMinSize() );
SetInitialSize( GetMinSize() );
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS