revert r74683, wxTLW has its own {Width,Height}Default()

[wxWidgets.git] / src / os2 / joystick.cpp

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 7d9ec64512197a9fa4fe0b7316af68b6a64d7f20..d12fa211bec0020706ff8e6bfdcbb8ee90863539 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -4,30 +4,28 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-//
 // For compilers that support precompilation, includes "wx.h".
-//
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
-#include "wx/string.h"
+#include "wx/joystick.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/window.h"
+#endif
+
 #define INCL_PM
 #define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX
 
-#include "wx/window.h"
-#include "wx/joystick.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
@@ -289,4 +287,5 @@ bool wxJoystick::ReleaseCapture()
     // TODO
     return false;
 }
+
 #endif  // wxUSE_JOYSTICK