mingw32 compilation fixes

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fe255032bb95d67583b80597e9ce15b65025dbd3..85308a7d1347ade8377bb7bce3727b90b6dc5e01 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -18,6 +18,7 @@
 
 #include "wx/control.h"
 #include "wx/icon.h"
+#include "wx/bitmap.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 3008d453a8c90b656715aa6df2101ff0a655fab0..ae9cde808a9f4c8d6d2e79e5ec06a793b1cc5586 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,14 +12,16 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
-#include "wx/setup.h"
-
 #if wxUSE_OWNER_DRAWN
 
 #ifdef    __GNUG__
     #pragma interface "ownerdrw.h"
 #endif
 
+#include "wx/bitmap.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
 //                behaviour