use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

[wxWidgets.git] / include / wx / joystick.h

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 3171fca87bcfb7e902d2b13fc4c533ea9ebbf946..d29ba50b25b2233e53ad5968035f6f2be4999dc0 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        joystick.h
+// Purpose:     wxJoystick base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) wxWidgets Team
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_JOYSTICK
 
 #if defined(__WXMSW__)
@@ -11,8 +24,10 @@
 #include "wx/unix/joystick.h"
 #elif defined(__WXX11__)
 #include "wx/unix/joystick.h"
+#elif defined(__DARWIN__)
+#include "wx/osx/core/joystick.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #endif