Rebake after last commit.

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 3e99d2349606ce3f17033ba9b5ac82a679ec5de9..2f77ae74c21b2c523594f2ab10e06cd13bee6524 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -24,10 +24,6 @@
 #   error You must set wxUSE_JOYSTICK to 1 in setup.h
 #endif
 
-#if !wxUSE_STATUSBAR
-#   error You must set wxUSE_STATUSBAR to 1 in setup.h
-#endif
-
 #include "wx/sound.h"
 #include "wx/joystick.h"
 
@@ -43,18 +39,22 @@ long ypos = -1;
 
 int winNumber = 1;
 
+int nButtons = 0;
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     wxJoystick stick(wxJOYSTICK1);
     if (!stick.IsOk())
     {
-        wxMessageBox(_T("No joystick detected!"));
+        wxMessageBox(wxT("No joystick detected!"));
         return false;
     }
 
 #if wxUSE_SOUND
-    m_fire.Create(_T("gun.wav"));
+    m_fire.Create(wxT("buttonpress.wav"));
 #endif // wxUSE_SOUND
 
     m_minX = stick.GetXMin();
@@ -64,30 +64,33 @@ bool MyApp::OnInit()
 
     // Create the main frame window
 
-    frame = new MyFrame(NULL, _T("Joystick Demo"), wxDefaultPosition,
+    frame = new MyFrame(NULL, wxT("Joystick Demo"), wxDefaultPosition,
         wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
 
   // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
-    frame->SetIcon(wxIcon(_T("joyicon")));
+    frame->SetIcon(wxIcon(wxT("joyicon")));
 #endif
 #ifdef __X__
-    frame->SetIcon(wxIcon(_T("joyicon.xbm")));
+    frame->SetIcon(wxIcon(wxT("joyicon.xbm")));
 #endif
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(JOYTEST_QUIT, _T("&Exit"));
+    file_menu->Append(JOYTEST_QUIT, wxT("&Exit"));
 
     wxMenuBar *menu_bar = new wxMenuBar;
 
-    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(file_menu, wxT("&File"));
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
+#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(), wxJoystick::GetNumberJoysticks()));
+#endif // wxUSE_STATUSBAR
 
     frame->CenterOnScreen();
     frame->Show(true);
@@ -106,6 +109,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);
 }
 
@@ -134,7 +138,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
         ymax += abs(ymin);
         pt.y += abs(ymin);
     }
-    
+
     // Scale to canvas size
     int cw, ch;
     GetSize(&cw, &ch);
@@ -151,13 +155,23 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     xpos = pt.x;
     ypos = pt.y;
 
+#if wxUSE_STATUSBAR
     wxString buf;
     if (event.ButtonDown())
-        buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
+        buf.Printf(wxT("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
     else
-        buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
+        buf.Printf(wxT("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
 
 #if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
@@ -178,11 +192,6 @@ MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
     canvas = new MyCanvas(this);
 }
 
-MyFrame::~MyFrame()
-{
-    // Empty
-}
-
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);