fixed loop deleting the old filters in SetWildcard() after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -915,7 +915,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
|
|||||||
{
|
{
|
||||||
m_bypassGenericImpl = bypassGenericImpl;
|
m_bypassGenericImpl = bypassGenericImpl;
|
||||||
|
|
||||||
if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
|
if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
|
||||||
wildCard, style, pos))
|
wildCard, style, pos))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@@ -1151,12 +1151,13 @@ void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
|
|||||||
wildFilters);
|
wildFilters);
|
||||||
wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
|
wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
|
||||||
|
|
||||||
size_t n, old_count = m_choice->GetCount();
|
const size_t countOld = m_choice->GetCount();
|
||||||
for ( n = 0; n < count; n++ )
|
size_t n;
|
||||||
|
for ( n = 0; n < countOld; n++ )
|
||||||
{
|
{
|
||||||
delete (wxString *)m_choice->GetClientData(n);
|
delete (wxString *)m_choice->GetClientData(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( n = 0; n < count; n++ )
|
for ( n = 0; n < count; n++ )
|
||||||
{
|
{
|
||||||
m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
|
m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
|
||||||
|
Reference in New Issue
Block a user