fixed assert when dumping a string which is locked for writing

[wxWidgets.git] / samples / sound / sound.cpp

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 6c50b7c3f950b497b881045d404225e170075e4e..7ddb31f5649a85adb121192d45a67136368ff1a6 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -111,7 +111,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Sound_About,            MyFrame::OnAbout)
     EVT_MENU(Sound_PlaySync,         MyFrame::OnPlaySync)
     EVT_MENU(Sound_PlayAsync,        MyFrame::OnPlayAsync)
-    EVT_MENU(Sound_PlayAsyncOnStack, MyFrame::OnPlayAsync)
+    EVT_MENU(Sound_PlayAsyncOnStack, MyFrame::OnPlayAsyncOnStack)
     EVT_MENU(Sound_PlayLoop,         MyFrame::OnPlayLoop)
 END_EVENT_TABLE()
 
@@ -164,12 +164,12 @@ MyFrame::MyFrame(const wxString& title)
     wxMenu *helpMenu = new wxMenu;
     wxMenu *playMenu = new wxMenu;
     helpMenu->Append(Sound_About, _T("&About...\tF1"), _T("Show about dialog"));
-    menuFile->Append(Sound_SelectFile, _T("&Select WAV file"), _T("Select a new wav file to play"));
+    menuFile->Append(Sound_SelectFile, _T("&Select WAV file\tCtrl+O"), _T("Select a new wav file to play"));
     menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
-    playMenu->Append(Sound_PlaySync, _T("Play sound &synchronously"));
-    playMenu->Append(Sound_PlayAsync, _T("Play sound &asynchronously"));
-    playMenu->Append(Sound_PlayAsync, _T("Play sound asynchronously (&object on stack)"));
-    playMenu->Append(Sound_PlayLoop, _T("&Loop sound"));
+    playMenu->Append(Sound_PlaySync, _T("Play sound &synchronously\tCtrl+S"));
+    playMenu->Append(Sound_PlayAsync, _T("Play sound &asynchronously\tCtrl+A"));
+    playMenu->Append(Sound_PlayAsyncOnStack, _T("Play sound asynchronously (&object on stack)\tCtrl+T"));
+    playMenu->Append(Sound_PlayLoop, _T("&Loop sound\tCtrl+L"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
@@ -180,7 +180,7 @@ MyFrame::MyFrame(const wxString& title)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
-    m_tc = new wxTextCtrl(this, -1, wxEmptyString,
+    m_tc = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                           wxDefaultPosition, wxDefaultSize,
                           wxTE_MULTILINE|wxTE_READONLY);
     NotifyUsingFile(m_soundFile);