Reverted last wxBookCtrl change and added alignment check to notebook

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 51e617809459baca011d51245d147ac6fa6b5196..78e023fd737eb9d6d350ce796dcfd7e38a52fea7 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
 #include "wx/msw/private.h"
 
 #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)


@@ -36,7 +36,6 @@
 #define NO_JOYGETPOSEX
 #endif
 
 #define NO_JOYGETPOSEX
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/registry.h"
 
 #include <regstr.h>
 #include "wx/msw/registry.h"
 
 #include <regstr.h>