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 c458f487b982f0f913f5242328e91d22de3bbe1d..569e3d80b2aa0596fe63cfbc1293f63ceec95217 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,9 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/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_
 
 #ifndef _WX_JOYSTICK_H_BASE_
 #define _WX_JOYSTICK_H_BASE_
 

+#include "wx/defs.h"
+

 #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"


@@ -12,7 +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__)
+#include "wx/osx/joystick.h"

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