X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a800dc50d47f5ecd1bcba7601f33843c01db9a57..538f284a44001ff8285eaafebcc384bf638b5d66:/samples/joytest/joytest.cpp

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index bcc1dd71c5..6bf7bc96c3 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -24,15 +24,17 @@
 #   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"
 
 #include "joytest.h"
 
+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+
 MyFrame *frame = NULL;
 
 IMPLEMENT_APP(MyApp)
@@ -43,18 +45,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!"));
-        return FALSE;
+        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,37 +70,32 @@ 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")));
-#endif
-#ifdef __X__
-    frame->SetIcon(wxIcon(_T("joyicon.xbm")));
-#endif
+    frame->SetIcon(wxICON(sample));
 
     // 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);
-
-    SetTopWindow(frame);
+    frame->Show(true);
 
-    return TRUE;
+    return true;
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
@@ -103,9 +104,10 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
-    wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+    wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER)
 {
     m_stick = new wxJoystick(wxJOYSTICK1);
+    nButtons = m_stick->GetNumberButtons();
     m_stick->SetCapture(this, 10);
 }
 
@@ -129,14 +131,12 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     if (xmin < 0) {
         xmax += abs(xmin);
         pt.x += abs(xmin);
-        xmin = 0;
     }
     if (ymin < 0) {
         ymax += abs(ymin);
         pt.y += abs(ymin);
-        ymin = 0;
     }
-    
+
     // Scale to canvas size
     int cw, ch;
     GetSize(&cw, &ch);
@@ -153,13 +153,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())
@@ -175,19 +185,14 @@ END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
     const wxSize& size, const long style)
-    : wxFrame(parent, -1, title, pos, size, style)
+    : wxFrame(parent, wxID_ANY, title, pos, size, style)
 {
     canvas = new MyCanvas(this);
 }
 
-MyFrame::~MyFrame()
-{
-    // Empty
-}
-
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void MyFrame::OnActivate(wxActivateEvent& event)