1. corrected uninitialised variable (which led to crash) in wxListBox
2. corrected assert failures in wxChoiceDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -310,8 +310,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||
gtk_widget_show( GTK_WIDGET(m_list) );
|
||||
|
||||
wxSize newSize = size;
|
||||
if (newSize.x == -1) newSize.x = 100;
|
||||
if (newSize.y == -1) newSize.y = 110;
|
||||
if (newSize.x == -1)
|
||||
newSize.x = 100;
|
||||
if (newSize.y == -1)
|
||||
newSize.y = 110;
|
||||
SetSize( newSize.x, newSize.y );
|
||||
|
||||
if ( style & wxLB_SORT )
|
||||
@@ -319,6 +321,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||
// this will change DoAppend() behaviour
|
||||
m_strings = new wxSortedArrayString;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_strings = (wxSortedArrayString *)NULL;
|
||||
}
|
||||
|
||||
for (int i = 0; i < n; i++)
|
||||
{
|
||||
|
Reference in New Issue
Block a user