use C++ compiler for va_copy test, at least under IRIX the C99 C compiler has it...

[wxWidgets.git] / src / os2 / joystick.cpp

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 0b19280bc72bea8d59caf9b5a02670ec76061c43..2117fd31e3f3616ed94b06519cc418aff4b1b254 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -9,25 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-//

 // For compilers that support precompilation, includes "wx.h".
 // For compilers that support precompilation, includes "wx.h".

-//

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_JOYSTICK
 
 #if wxUSE_JOYSTICK
 

-#include "wx/string.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"
+#endif
+

 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 
 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 

-#include "wx/window.h"
-#include "wx/joystick.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes


@@ -101,7 +100,7 @@ bool wxJoystick::IsOk() const
     return false;
 }
 
     return false;
 }
 

-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -289,4 +288,5 @@ bool wxJoystick::ReleaseCapture()
     // TODO
     return false;
 }
     // TODO
     return false;
 }

+

 #endif  // wxUSE_JOYSTICK
 #endif  // wxUSE_JOYSTICK