X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/600683ca0561c9d56e73f1faa3f21d8a6670936b..4263de1e0586d20cb49d0dde23f0d227c5ef25cb:/samples/joytest/joytest.cpp

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index bfcb3873b9..4d5be8b350 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -28,7 +28,7 @@
 #   error You must set wxUSE_STATUSBAR to 1 in setup.h
 #endif
 
-#include "wx/wave.h"
+#include "wx/sound.h"
 #include "wx/joystick.h"
 
 #include "joytest.h"
@@ -53,9 +53,9 @@ bool MyApp::OnInit()
         return FALSE;
     }
 
-#if wxUSE_WAVE
+#if wxUSE_SOUND
     m_fire.Create(_T("gun.wav"));
-#endif // wxUSE_WAVE
+#endif // wxUSE_SOUND
 
     m_maxX = stick.GetXMax();
     m_maxY = stick.GetYMax();
@@ -143,12 +143,12 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 
     frame->SetStatusText(buf);
 
-#if wxUSE_WAVE
+#if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
     {
         wxGetApp().m_fire.Play();
     }
-#endif // wxUSE_WAVE
+#endif // wxUSE_SOUND
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -167,7 +167,7 @@ MyFrame::~MyFrame()
     // Empty
 }
 
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 }