Rebaked makefiles after htmllistbox and collapsable panel additions.

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

diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index 9a08f6f5e3ca9f9d60e019d288739058b743ed0c..0c50e66e6221f474c53ce556b1e1699901268b13 100644 (file)
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -5,43 +5,47 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
 class MyApp: public wxApp
 {
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
 class MyApp: public wxApp
 {

-  public:
-    bool OnInit(void);
+public:
+    bool OnInit();

 
     // Joystick max values
 
     // Joystick max values

+    int     m_minX;
+    int     m_minY;

     int     m_maxX;
     int     m_maxY;
 
     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)
 
 class MyCanvas: public wxScrolledWindow
 {
 };
 
 DECLARE_APP(MyApp)
 
 class MyCanvas: public wxScrolledWindow
 {

-  public:
+public:

     MyCanvas(wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
     MyCanvas(wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);

-    ~MyCanvas(void);
+    ~MyCanvas();

     void OnJoystickEvent(wxJoystickEvent& event);
 
     void OnJoystickEvent(wxJoystickEvent& event);
 

+    wxJoystick* m_stick;

     DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {
     DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {

-  public:
+public:

     MyCanvas *canvas;
     MyCanvas *canvas;

-    MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-    ~MyFrame(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);
 
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 


@@ -49,4 +53,3 @@ DECLARE_EVENT_TABLE()
 };
 
 #define JOYTEST_QUIT        1
 };
 
 #define JOYTEST_QUIT        1

-#define JOYTEST_ABOUT       2