Corrected points to pixels calculation

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 7298b2f286e8e6db0e249f4e8db72034da9f7cd4..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/wave.h>
-#include <wx/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"
 


@@ -130,9 +134,9 @@ 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);
 
 #if wxUSE_WAVE
   frame->SetStatusText(buf);
 
 #if wxUSE_WAVE