allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index b0ff1ef04dfc1f80b93bbfb3ef861c17df3f17d7..d29ba50b25b2233e53ad5968035f6f2be4999dc0 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,12 +1,38 @@
-#ifndef __JOYSTICKH_BASE__
-#define __JOYSTICKH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// 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__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
+#include "wx/unix/joystick.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/joystick.h"
+#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/osx/joystick.h"
+#elif defined(__WXPM__)
+#include "wx/os2/joystick.h"
 #endif
 
+#endif // wxUSE_JOYSTICK
+
 #endif
-    // __JOYSTICKH_BASE__
+    // _WX_JOYSTICK_H_BASE_