Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index bbe8c582a436ef9c0a4d27ff544d9d5fd9d6d1e8..158970730693b4526ae52630ebe469fe5c6860c0 100644 (file)
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
@@ -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);