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:
@@ -233,8 +233,6 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
|
||||
const wxPoint& WXUNUSED(pos) )
|
||||
{
|
||||
m_selection = 0;
|
||||
m_clientData = NULL;
|
||||
m_stringSelection = wxT("");
|
||||
|
||||
m_dialogStyle = style;
|
||||
|
||||
@@ -290,7 +288,8 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
m_selection = m_listbox->GetSelection();
|
||||
m_stringSelection = m_listbox->GetStringSelection();
|
||||
m_clientData = m_listbox->GetClientData(m_selection);
|
||||
if ( m_listbox->HasClientUntypedData() )
|
||||
SetClientData(m_listbox->GetClientData(m_selection));
|
||||
|
||||
EndModal(wxID_OK);
|
||||
}
|
||||
@@ -299,7 +298,8 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
m_selection = m_listbox->GetSelection();
|
||||
m_stringSelection = m_listbox->GetStringSelection();
|
||||
m_clientData = m_listbox->GetClientData(m_selection);
|
||||
if ( m_listbox->HasClientUntypedData() )
|
||||
SetClientData(m_listbox->GetClientData(m_selection));
|
||||
|
||||
EndModal(wxID_OK);
|
||||
}
|
||||
|
Reference in New Issue
Block a user