fixed listbox initial size determination

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 8e5a52297f84c90154e08d4af36fda72ffc469bb..9cf8883c8e0e625ff8ee6957e27c50a16fae45a4 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -393,8 +393,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
-    SetBestSize( size );
-
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
@@ -411,6 +409,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         DoAppend(choices[i]);
     }
 
+    // call it after appending the strings to the listbox, otherwise it doesn't
+    // work correctly
+    SetBestSize( size );
+
     m_parent->DoAddChild( this );
 
     PostCreation();

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 8e5a52297f84c90154e08d4af36fda72ffc469bb..9cf8883c8e0e625ff8ee6957e27c50a16fae45a4 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -393,8 +393,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
-    SetBestSize( size );
-
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
@@ -411,6 +409,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         DoAppend(choices[i]);
     }
 
+    // call it after appending the strings to the listbox, otherwise it doesn't
+    // work correctly
+    SetBestSize( size );
+
     m_parent->DoAddChild( this );
 
     PostCreation();