fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index 754179f1f392ea0d2415f288cb3de37077733e6f..0c50e66e6221f474c53ce556b1e1699901268b13 100644 (file)
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,12 +16,14 @@ public:
     bool OnInit();
 
     // Joystick max values
+    int     m_minX;
+    int     m_minY;
     int     m_maxX;
     int     m_maxY;
 
-#if wxUSE_WAVE
-    wxWave  m_fire;
-#endif // wxUSE_WAVE
+#if wxUSE_SOUND
+    wxSound  m_fire;
+#endif // wxUSE_SOUND
 };
 
 DECLARE_APP(MyApp)
@@ -33,6 +35,7 @@ public:
     ~MyCanvas();
     void OnJoystickEvent(wxJoystickEvent& event);
 
+    wxJoystick* m_stick;
     DECLARE_EVENT_TABLE()
 };
 
@@ -42,7 +45,7 @@ public:
     MyCanvas *canvas;
     MyFrame(wxFrame *parent, const wxString& title,
         const wxPoint& pos, const wxSize& size, const long style);
-    ~MyFrame();
+    ~MyFrame(){};
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);