don't include missing.h before windows headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 6f7181bfa2f50ca5f8ebf4b4f774fe2004a222ac..3e87a50557df25eb42c86385d5dcfaf68a9c82df 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -27,8 +27,9 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

+#include "wx/display.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"


@@ -37,8 +38,8 @@
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 

-#include "wx/display.h"

 #include "wx/display_impl.h"
 #include "wx/display_impl.h"

+#include "wx/msw/missing.h"

 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really
 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index e482e95ff1b877a19cc7ded9fac2be4edf69f922..6c46ae230bb415bf81c5ccac6312e3bfed744761 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -27,13 +27,13 @@
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
 #include "wx/settings.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC

     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
 #endif
 
 #include "wx/msw/private.h"
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC

 
 #ifndef SPI_GETFLATMENU
 #define SPI_GETFLATMENU                     0x1022
 
 #ifndef SPI_GETFLATMENU
 #define SPI_GETFLATMENU                     0x1022

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index ec135e4af7802f2bde5e944220163d56baa9f19f..010c6d822c0543364580078fcb4d112c1b88ce63 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -29,7 +29,6 @@
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"


@@ -41,6 +40,7 @@
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 4f698250278bad841bc09d9d5a6dffdfb5f79868..973f77d2831af0f4c4b983790d26ff97f8da5300 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -27,7 +27,6 @@
 #if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
 #if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/brush.h"


@@ -74,6 +73,8 @@
 
 #endif // wxUSE_RICHEDIT
 
 
 #endif // wxUSE_RICHEDIT
 

+#include "wx/msw/missing.h"
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 3a1fa48ec11c9c172ddb824261e33d47a09ae7ac..947d932eb25570d93f65f51f47b18075879b2190 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -25,8 +25,9 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#include "wx/volume.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/msw/missing.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif
     #if wxUSE_GUI
         #include "wx/icon.h"
     #endif


@@ -38,10 +39,9 @@
 #include "wx/dynlib.h"
 #include "wx/arrimpl.cpp"
 
 #include "wx/dynlib.h"
 #include "wx/arrimpl.cpp"
 

-#include "wx/volume.h"
-

 #include <shellapi.h>
 #include <shlobj.h>
 #include <shellapi.h>
 #include <shlobj.h>

+#include "wx/msw/missing.h"

 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE