X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5276b0a53cef4815230e39b54d2ecda14f72cbd1..4c86168d9aaa36cffc74afbc6abd1ff5b270db64:/samples/sound/sound.cpp diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index d41c7a2a80..8d450699be 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -36,7 +36,7 @@ // ---------------------------------------------------------------------------- // the application icon (under Windows and OS/2 it is in resources) -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -213,7 +213,7 @@ MyFrame::MyFrame(const wxString& title) playMenu->Append(Sound_PlayBell, wxT("Play system bell")); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(Sound_About, wxT("&About...\tF1"), wxT("Show about dialog")); + helpMenu->Append(Sound_About, wxT("&About\tF1"), wxT("Show about dialog")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); @@ -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();