Rebake after last commit.

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index bfcb3873b94991ac65b808a138478494c6667824..2f77ae74c21b2c523594f2ab10e06cd13bee6524 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -24,11 +24,7 @@
 #   error You must set wxUSE_JOYSTICK to 1 in setup.h
 #endif
 
 #   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/wave.h"
+#include "wx/sound.h"

 #include "wx/joystick.h"
 
 #include "joytest.h"
 #include "wx/joystick.h"
 
 #include "joytest.h"


@@ -43,56 +39,65 @@ long ypos = -1;
 
 int winNumber = 1;
 
 
 int winNumber = 1;
 

+int nButtons = 0;

 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     wxJoystick stick(wxJOYSTICK1);
     if (!stick.IsOk())
     {
     wxJoystick stick(wxJOYSTICK1);
     if (!stick.IsOk())
     {

-        wxMessageBox(_T("No joystick detected!"));
-        return FALSE;
+        wxMessageBox(wxT("No joystick detected!"));
+        return false;

     }
 
     }
 

-#if wxUSE_WAVE
-    m_fire.Create(_T("gun.wav"));
-#endif // wxUSE_WAVE
+#if wxUSE_SOUND
+    m_fire.Create(wxT("buttonpress.wav"));
+#endif // wxUSE_SOUND

 
 

+    m_minX = stick.GetXMin();
+    m_minY = stick.GetYMin();

     m_maxX = stick.GetXMax();
     m_maxY = stick.GetYMax();
 
     // Create the main frame window
 
     m_maxX = stick.GetXMax();
     m_maxY = stick.GetYMax();
 
     // 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__
         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__
 #endif
 #ifdef __X__

-    frame->SetIcon(wxIcon(_T("joyicon.xbm")));
+    frame->SetIcon(wxIcon(wxT("joyicon.xbm")));

 #endif
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
 #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;
 
 
     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);
 
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     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->CenterOnScreen();

-    frame->Show(TRUE);
+    frame->Show(true);

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)


@@ -101,16 +106,17 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
 
 // 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)

 {
 {

-    wxJoystick joystick(wxJOYSTICK1);
-    joystick.SetCapture(this);
+    m_stick = new wxJoystick(wxJOYSTICK1);
+    nButtons = m_stick->GetNumberButtons();
+    m_stick->SetCapture(this, 10);

 }
 
 MyCanvas::~MyCanvas()
 {
 }
 
 MyCanvas::~MyCanvas()
 {

-    wxJoystick joystick(wxJOYSTICK1);
-    joystick.ReleaseCapture();
+    m_stick->ReleaseCapture();
+    delete m_stick;

 }
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 }
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)


@@ -119,12 +125,26 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 
     wxPoint pt(event.GetPosition());
 
 
     wxPoint pt(event.GetPosition());
 

+    // if negative positions are possible then shift everything up
+    int xmin = wxGetApp().m_minX;
+    int xmax = wxGetApp().m_maxX;
+    int ymin = wxGetApp().m_minY;
+    int ymax = wxGetApp().m_maxY;
+    if (xmin < 0) {
+        xmax += abs(xmin);
+        pt.x += abs(xmin);
+    }
+    if (ymin < 0) {
+        ymax += abs(ymin);
+        pt.y += abs(ymin);
+    }
+

     // Scale to canvas size
     int cw, ch;
     GetSize(&cw, &ch);
 
     // Scale to canvas size
     int cw, ch;
     GetSize(&cw, &ch);
 

-    pt.x = (long) (((double)pt.x/(double)wxGetApp().m_maxX) * cw);
-    pt.y = (long) (((double)pt.y/(double)wxGetApp().m_maxY) * ch);
+    pt.x = (long) (((double)pt.x/(double)xmax) * cw);
+    pt.y = (long) (((double)pt.y/(double)ymax) * ch);

 
     if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
     {
 
     if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
     {


@@ -135,20 +155,30 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     xpos = pt.x;
     ypos = pt.y;
 
     xpos = pt.x;
     ypos = pt.y;
 

+#if wxUSE_STATUSBAR

     wxString buf;
     if (event.ButtonDown())
     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
     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);
 
     frame->SetStatusText(buf);

+#endif // wxUSE_STATUSBAR

 
 

-#if wxUSE_WAVE
+#if wxUSE_SOUND

     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
     {
         wxGetApp().m_fire.Play();
     }
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
     {
         wxGetApp().m_fire.Play();
     }

-#endif // wxUSE_WAVE
+#endif // wxUSE_SOUND

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -157,19 +187,14 @@ END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
     const wxSize& size, const long style)
 
 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);
 }
 
 {
     canvas = new MyCanvas(this);
 }
 

-MyFrame::~MyFrame()
-{
-    // Empty
-}
-
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnActivate(wxActivateEvent& event)
 }
 
 void MyFrame::OnActivate(wxActivateEvent& event)