From 7ec5921d9b162371095271490169ca5149786aea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 3 May 2004 12:49:22 +0000 Subject: [PATCH] set best size after filling the control with strings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/listbox.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 6c82458ece..61634811fa 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -59,7 +59,7 @@ wxBEGIN_FLAGS( wxListBoxStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -103,7 +103,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxListBox) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) +wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) #else IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) #endif @@ -184,6 +184,9 @@ bool wxListBox::Create(wxWindow *parent, Append(choices[i]); } + // now we can compute our best size correctly, so do it if necessary + SetBestSize(size); + return true; } @@ -387,7 +390,7 @@ void wxListBox::Free() void wxListBox::SetSelection(int N, bool select) { - wxCHECK_RET( N == wxNOT_FOUND || + wxCHECK_RET( N == wxNOT_FOUND || (N >= 0 && N < m_noItems), wxT("invalid index in wxListBox::SetSelection") ); -- 2.45.2