Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finalize wxJoystick on mac. Note change. Pretty up joystick sample a bit. Don't logsyserror when wxSound can't find a file - its annoying.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-14 20:12:11 +00:00
parent 01526d4f6c
commit 65442ab650
6 changed files with 215 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/joytest/joytest.cpp
View File

@@ -39,6 +39,7 @@ long ypos = -1;
int winNumber = 1;
int nButtons = 0;
// Initialise this in OnInit, not statically
bool MyApp::OnInit()
{
@@ -85,7 +86,7 @@ bool MyApp::OnInit()
#if wxUSE_STATUSBAR
frame->CreateStatusBar();
frame->SetStatusText(wxT("Ready..."));
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()));
#endif // wxUSE_STATUSBAR
frame->CenterOnScreen();
@@ -105,6 +106,7 @@ MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER)
{
m_stick = new wxJoystick(wxJOYSTICK1);
nButtons = m_stick->GetNumberButtons();
m_stick->SetCapture(this, 10);
}
@@ -153,10 +155,18 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
#if wxUSE_STATUSBAR
wxString buf;
if (event.ButtonDown())
buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
buf.Printf(_T("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
else
buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
buf.Printf(_T("Joystick (%d, %d) "), pt.x, pt.y);
/*
for(int i = 0; i < nButtons; ++i)
{
buf += wxString(wxT("[")) +
((event.GetButtonState() & (1 << i)) ? wxT("Y") : wxT("N")) + wxString(wxT("]"));
}
*/
frame->SetStatusText(buf);
#endif // wxUSE_STATUSBAR