X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..00eef16d51fcb5e4dd735c761f0538a76f2995ae:/samples/sound/sound.cpp diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index ab745c89ac..abae8a45ce 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -993,7 +993,13 @@ void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event)) #if wxUSE_FILEDLG wxFileDialog dlg(this, wxT("Choose a sound file"), wxEmptyString, wxEmptyString, - wxT("WAV files (*.wav)|*.wav"), wxFD_OPEN|wxFD_CHANGE_DIR); + wxString::Format + ( + "WAV files (*.wav)|*.wav|All files (%s)|%s", + wxFileSelectorDefaultWildcardStr, + wxFileSelectorDefaultWildcardStr + ), + wxFD_OPEN|wxFD_CHANGE_DIR); if ( dlg.ShowModal() == wxID_OK ) { m_soundFile = dlg.GetPath(); @@ -1002,8 +1008,7 @@ void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event)) #endif // __WXMSW__ m_useMemory = false; - delete m_sound; - m_sound = NULL; + wxDELETE(m_sound); NotifyUsingFile(m_soundFile); } #endif // wxUSE_FILEDLG @@ -1026,8 +1031,7 @@ void MyFrame::OnSelectResource(wxCommandEvent& WXUNUSED(event)) m_soundFile.clear(); m_useMemory = false; - delete m_sound; - m_sound = NULL; + wxDELETE(m_sound); NotifyUsingFile(wxT("Windows WAV resource")); }