compilation fix after wxGUIAppTraits::GetToolkitVersion() introduction

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 403ea91a8eaa7b902947e1ddc406195897ab911f..65ca2e196c0b1e805f62bbc48ba77f8803f91d25 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -51,7 +51,7 @@ bool MyApp::OnInit()
     }
 
 #if wxUSE_SOUND
-    m_fire.Create(_T("gun.wav"));
+    m_fire.Create(_T("buttonpress.wav"));
 #endif // wxUSE_SOUND
 
     m_minX = stick.GetXMin();
@@ -86,7 +86,7 @@ bool MyApp::OnInit()
 
 #if wxUSE_STATUSBAR
     frame->CreateStatusBar();
-    frame->SetStatusText(wxString::Format(wxT("Device [%s] (PID:[%i] MID:[%i]) Ready... # of joysticks:[%i]"), stick.GetProductName().c_str(), stick.GetProductId(), stick.GetManufacturerId(), stick.GetNumberJoysticks()));
+    frame->SetStatusText(wxString::Format(wxT("Device [%s] (PID:[%i] MID:[%i]) Ready... # of joysticks:[%i]"), stick.GetProductName().c_str(), stick.GetProductId(), stick.GetManufacturerId(), wxJoystick::GetNumberJoysticks()));
 #endif // wxUSE_STATUSBAR
 
     frame->CenterOnScreen();
@@ -162,11 +162,11 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 /*
     for(int i = 0; i < nButtons; ++i)
     {
-        buf += wxString(wxT("[")) + 
+        buf += wxString(wxT("[")) +
         ((event.GetButtonState() & (1 << i)) ? wxT("Y") : wxT("N")) + wxString(wxT("]"));
     }
 */
-    
+
     frame->SetStatusText(buf);
 #endif // wxUSE_STATUSBAR