htmlhelp.h no longer needed -> removed test in configure

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 92add26604ca1b80f0658e3356a024adf9ec17c1..a0737939281543fe2b38ade48e3cb38478b18a33 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -20,8 +20,12 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/msw/wave.h>
-#include <wx/msw/joystick.h>
+#if !wxUSE_JOYSTICK
+#error You must set wxUSE_JOYSTICK to 1 in setup.h!
+#endif
+
+#include "wx/wave.h"
+#include "wx/joystick.h"

 
 #include "joytest.h"
 
 
 #include "joytest.h"
 


@@ -44,7 +48,9 @@ bool MyApp::OnInit(void)
     wxMessageBox("No joystick detected!");
     return FALSE;
   }
     wxMessageBox("No joystick detected!");
     return FALSE;
   }

+#if wxUSE_WAVE

   m_fire.Create("gun.wav");
   m_fire.Create("gun.wav");

+#endif // wxUSE_WAVE

 
   m_maxX = stick.GetXMax();
   m_maxY = stick.GetYMax();
 
   m_maxX = stick.GetXMax();
   m_maxY = stick.GetYMax();


@@ -128,15 +134,17 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 
   char buf[100];
   if (event.ButtonDown())
 
   char buf[100];
   if (event.ButtonDown())

-    sprintf(buf, "Joystick (%ld, %ld) Fire!", pt.x, pt.y);
+    sprintf(buf, "Joystick (%d, %d) Fire!", pt.x, pt.y);

   else
   else

-    sprintf(buf, "Joystick (%ld, %ld)", pt.x, pt.y);
+    sprintf(buf, "Joystick (%d, %d)", pt.x, pt.y);

   frame->SetStatusText(buf);
 
   frame->SetStatusText(buf);
 

+#if wxUSE_WAVE

   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

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


@@ -164,8 +172,3 @@ void MyFrame::OnActivate(wxActivateEvent& event)
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }

-
-bool MyFrame::OnClose(void)
-{
-  return TRUE;
-}
\ No newline at end of file