X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbf1f0e5cffb8c01696eb26e254857a61f017d70..0e974385f6ab66910ee42ca287fbf9ada2392dc1:/samples/joytest/joytest.h?ds=sidebyside

diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index 68c4f68075..bbe8c582a4 100644
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -5,30 +5,32 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
 class MyApp: public wxApp
 {
-  public:
-    bool OnInit(void);
+public:
+    bool OnInit();
 
     // Joystick max values
     int     m_maxX;
     int     m_maxY;
 
+#if wxUSE_WAVE
     wxWave  m_fire;
+#endif // wxUSE_WAVE
 };
 
 DECLARE_APP(MyApp)
 
 class MyCanvas: public wxScrolledWindow
 {
-  public:
+public:
     MyCanvas(wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
-    ~MyCanvas(void);
+    ~MyCanvas();
     void OnJoystickEvent(wxJoystickEvent& event);
 
     DECLARE_EVENT_TABLE()
@@ -36,11 +38,11 @@ class MyCanvas: public wxScrolledWindow
 
 class MyFrame: public wxFrame
 {
-  public:
+public:
     MyCanvas *canvas;
-    MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-    ~MyFrame(void);
-    bool OnClose(void);
+    MyFrame(wxFrame *parent, const wxString& title,
+        const wxPoint& pos, const wxSize& size, const long style);
+    ~MyFrame();
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
@@ -48,4 +50,3 @@ DECLARE_EVENT_TABLE()
 };
 
 #define JOYTEST_QUIT        1
-#define JOYTEST_ABOUT       2