PCH-less build fix by Tim S

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 58d5344e22ad9d3fab8e1345858b7c46c39c90ab..7727d64781bc6d37d96d854f558a462e7a16a065 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -26,7 +26,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 #include "wx/textentry.h"
 
 class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
 #include "wx/textentry.h"
 
 class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,

-                                   public wxTextEntry
+                                        public wxTextEntry

 {
 public:
     // override these methods to disambiguate between two base classes versions
 {
 public:
     // override these methods to disambiguate between two base classes versions

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index b45d932f656192fcd04d87f7312ead3576577520..2c2c524b650b3caf21e01e78a36816880330a394 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -13,6 +13,8 @@
 #define _WX_MSW_EVTLOOP_H_
 
 #if wxUSE_GUI
 #define _WX_MSW_EVTLOOP_H_
 
 #if wxUSE_GUI

+#include "wx/dynarray.h"
+#include "wx/msw/wrapwin.h"

 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"
 #endif
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 7cd4a484c40ce4e718bf3c3d6516c8e5c058b86b..4f9c74adc3a2b926c079ca1404d7b265a4b5483d 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -29,6 +29,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"

+    #include "wx/log.h"

     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/stopwatch.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/stopwatch.h"

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 26848196fa87237c4c7f7997d8f4674aaa7dfb1e..dc42cdbf023fe0f069f6853bd15bf1f457a0f136 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -24,12 +24,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/evtloop.h"
-

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/event.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/evtloop.h"
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------

diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 3ef53a321bd94f8ceccc04a7fcd209b70dfffcfc..51d1c26618af4524e78004b7e240c2ffc2dbdb02 100644 (file)
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/event.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"