Misc small mods

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 407e7041308cef05985064547c04764f62a13735..cd636fba81cc321dcfde821d03902a42976c4ed4 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -24,7 +24,7 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
@@ -34,7 +34,9 @@ typedef UINT MMRESULT;
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+#ifndef wxUSE_NORLANDER_HEADERS
+#include "wx/msw/gnuwin32/extra.h"
+#endif
 #endif
 #endif
 
@@ -43,8 +45,8 @@ typedef UINT MMRESULT;
 #define NO_JOYGETPOSEX
 #endif
 
-#include <wx/window.h>
-#include <wx/msw/joystick.h>
+#include "wx/window.h"
+#include "wx/msw/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)