A few small fixes for cross compilation

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 89117cec8c563d4f857f17d603b2bc51dd530e0f..ea266a31b07e80749658146c3cea630d977ffd0a 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -18,6 +18,7 @@
 #if wxUSE_HTML
 
 #include <wx/window.h>
+#include <wx/scrolwin.h>
 #include <wx/config.h>
 #include <wx/treectrl.h>
 #include <wx/html/htmlwinparser.h>

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index df6b479e9c551b7659813f162b657c12ffd44c53..25041b8fa8d7f99e0972a2ba9b4b2744b9323cc8 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -20,6 +20,8 @@
 // typedef   unsigned int  size_t;
 #include <stddef.h>
 
+#include "wx/setup.h"
+
 #if !wxUSE_OWNER_DRAWN
   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 3e6aad81d7934125790a66469852d85d02c5ce86..99ce435c77855335c4218aa9f47cb81627e58b2d 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -19,6 +19,7 @@
 #include "wx/defs.h"
 #include "wx/event.h"
 #include "wx/dynarray.h"
+#include "wx/msw/accel.h"
 
 class WXDLLEXPORT wxMenuItem;
 class WXDLLEXPORT wxMenuBar;

diff --git a/include/wx/msw/settings.h b/include/wx/msw/settings.h
index 2df189e9ae0e7d7175773bc9f9d994d1871723f8..95e58680f686cb884fdfd2c3efaf416a21047949 100644 (file)
--- a/include/wx/msw/settings.h
+++ b/include/wx/msw/settings.h
@@ -17,6 +17,8 @@
 #endif
 
 #include "wx/setup.h"
+#include "wx/colour.h"
+#include "wx/font.h"
 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 4da9e6f89d9da8b30d86befb6421bd3467dd6660..e412b276ad7a64c9a520523e70186a5f449cf40d 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/icon.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;