Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 1fe2e6d55e80c9d050c4b55f9338b3fb75884925..569e3d80b2aa0596fe63cfbc1293f63ceec95217 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.h
+// Name:        wx/joystick.h

 // Purpose:     wxJoystick base header
 // Author:      wxWidgets Team
 // Modified by:
 // Purpose:     wxJoystick base header
 // Author:      wxWidgets Team
 // Modified by:


@@ -16,7 +16,7 @@
 
 #if wxUSE_JOYSTICK
 
 
 #if wxUSE_JOYSTICK
 

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #include "wx/unix/joystick.h"
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 #include "wx/unix/joystick.h"


@@ -25,9 +25,9 @@
 #elif defined(__WXX11__)
 #include "wx/unix/joystick.h"
 #elif defined(__DARWIN__)
 #elif defined(__WXX11__)
 #include "wx/unix/joystick.h"
 #elif defined(__DARWIN__)

-#include "wx/mac/corefoundation/joystick.h"
+#include "wx/osx/core/joystick.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"

 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #endif
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #endif