non-pch build fixes

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index c5789687fe39459bb14f43d64f52937a8c558f92..240e2e981327807505acdd3a142dd1fa794f1acb 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -37,15 +37,16 @@
     #include "wx/dcscreen.h"
     #include "wx/dcclient.h"
     #include "wx/toplevel.h"
+    #include "wx/msw/wrapcctl.h"
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"
 #endif
 
 #include "wx/imaglist.h"
 #include "wx/stockitem.h"
-#include "wx/msw/private.h"
 #include "wx/msw/private/button.h"
 #include "wx/msw/private/dc.h"
 #include "wx/private/window.h"
-#include "wx/msw/missing.h"
 
 using namespace wxMSWImpl;
 

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 9b8440932abb2bac1d51efb15d9d9a472a7466a3..8ea5e5e5f01dd722777c5be060e91e3e7f7391e6 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -18,8 +18,6 @@
 
 #if wxUSE_MSGDLG
 
-#include "wx/ptr_scpd.h"
-
 // there is no hook support under CE so we can't use the code for message box
 // positioning there
 #ifndef __WXWINCE__
@@ -29,21 +27,21 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msgdlg.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
-    #include "wx/dialog.h"
+    #include "wx/msw/private.h"
     #if wxUSE_MSGBOX_HOOK
         #include "wx/hashmap.h"
     #endif
 #endif
 
+#include "wx/ptr_scpd.h"
 #include "wx/dynlib.h"
-#include "wx/msw/private.h"
 #include "wx/msw/private/button.h"
 #include "wx/msw/private/metrics.h"
 #include "wx/msw/private/msgdlg.h"
-#include "wx/msgdlg.h"
 
 #if wxUSE_MSGBOX_HOOK
     #include "wx/fontutil.h"

diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp
index cf03fd80f13c6daa652cca553fc365a21c05d39a..254fa00679c19f10811cc6f988c90c32c693ecbc 100644 (file)
--- a/src/msw/progdlg.cpp
+++ b/src/msw/progdlg.cpp
@@ -25,8 +25,16 @@
 
 #if wxUSE_PROGRESSDLG && wxUSE_THREADS
 
-#include "wx/msw/private/msgdlg.h"
 #include "wx/progdlg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/stopwatch.h"
+    #include "wx/msw/private.h"
+#endif
+
+#include "wx/msw/private/msgdlg.h"
 #include "wx/evtloop.h"
 
 using namespace wxMSWMessageDialog;

diff --git a/src/msw/richmsgdlg.cpp b/src/msw/richmsgdlg.cpp
index c329f503d16e8e51fcb4047daed1db46dc7340d0..fe0bb4940dd24b360377f155993792849783521e 100644 (file)
--- a/src/msw/richmsgdlg.cpp
+++ b/src/msw/richmsgdlg.cpp
@@ -19,6 +19,10 @@
 
 #include "wx/richmsgdlg.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/msw/private.h"
+#endif
+
 // This will define wxHAS_MSW_TASKDIALOG if we have support for it in the
 // headers we use.
 #include "wx/msw/private/msgdlg.h"