From e2c33b5595d11c5537ad24c1af02efca76858169 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Fri, 13 Mar 2009 21:02:13 +0000 Subject: [PATCH] Only MSW supports loading sounds from data. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/sound/sound.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 4c4c869c83..5b92e205eb 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -194,8 +194,9 @@ MyFrame::MyFrame(const wxString& title) menuFile->Append(Sound_SelectFile, _T("Select WAV &file...\tCtrl-O"), _T("Select a new wav file to play")); #ifdef __WXMSW__ menuFile->Append(Sound_SelectResource, _T("Select WAV &resource...\tCtrl-R"), _T("Select a new resource to play")); -#endif // __WXMSW__ menuFile->Append(Sound_SelectMemory, _T("Select WAV &data\tCtrl-M"), _T("Choose to play from memory buffer")); +#endif // __WXMSW__ + menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *playMenu = new wxMenu; @@ -227,6 +228,7 @@ MyFrame::MyFrame(const wxString& title) bool MyFrame::CreateSound(wxSound& snd) const { +#ifdef __WXMSW__ if ( m_useMemory ) { // this is the dump of cuckoo.wav @@ -960,7 +962,6 @@ bool MyFrame::CreateSound(wxSound& snd) const return snd.Create(sizeof(data), data); } -#ifdef __WXMSW__ if ( !m_soundRes.empty() ) { return snd.Create(m_soundRes, true); -- 2.50.0