don't crash if (char*)c_str() is used twice in a row on the same string and both...

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index b6aff395c670c4e72a53fcdb327ef0630059ea2b..1fe2e6d55e80c9d050c4b55f9338b3fb75884925 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
+/////////////////////////////////////////////////////////////////////////////
 
-#if defined(__WINDOWS__)
+#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(__MOTIF__)
-#elif defined(__GTK__)
-#include "wx/gtk/joystick.h"
+#elif defined(__WXMOTIF__)
+#include "wx/unix/joystick.h"
+#elif defined(__WXGTK__)
+#include "wx/unix/joystick.h"
+#elif defined(__WXX11__)
+#include "wx/unix/joystick.h"
+#elif defined(__DARWIN__)
+#include "wx/mac/corefoundation/joystick.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/joystick.h"
+#elif defined(__WXPM__)
+#include "wx/os2/joystick.h"
 #endif
 
+#endif // wxUSE_JOYSTICK
+
 #endif
-    // __JOYSTICKH_BASE__
+    // _WX_JOYSTICK_H_BASE_