Wrap wxImage specifics in wxUSE_IMAGE and wxBitmap specifics in wxUSE_GUI.

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

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index f1d3fa96d55584e8ab62e9260c38531aca9111b3..7ddb31f5649a85adb121192d45a67136368ff1a6 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sound.cpp
-// Purpose:     Example of sound playing in wxWindows
+// Purpose:     Example of sound playing in wxWidgets
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/01/29
@@ -16,7 +16,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
@@ -77,7 +77,7 @@ private:
     wxString    m_soundFile;
     wxTextCtrl* m_tc;
     
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -99,10 +99,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -111,11 +111,11 @@ 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()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -134,7 +134,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("wxWindows Sound Sample"));
+    MyFrame *frame = new MyFrame(_T("wxWidgets Sound Sample"));
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
@@ -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,8 @@ MyFrame::MyFrame(const wxString& title)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
-    m_tc = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize,
+    m_tc = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+                          wxDefaultPosition, wxDefaultSize,
                           wxTE_MULTILINE|wxTE_READONLY);
     NotifyUsingFile(m_soundFile);
 }