From 196785e6b7a5b69b7f16abb65c2397954192bbf9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 28 Mar 2005 13:43:20 +0000 Subject: [PATCH] Rename wave file to be less agressive, for later replacement with arbitrary sound git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/joytest/{gun.wav => buttonpress.wav} | Bin samples/joytest/joytest.cpp | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename samples/joytest/{gun.wav => buttonpress.wav} (100%) diff --git a/samples/joytest/gun.wav b/samples/joytest/buttonpress.wav similarity index 100% rename from samples/joytest/gun.wav rename to samples/joytest/buttonpress.wav diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index 403ea91a8e..0366659659 100644 --- 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(); @@ -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 -- 2.50.0