applied patch 441270 (fix cygwin wxSplashScreen compilation)

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

diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index f8e4d7c7a37078e9b257e59fb8a8b59ce80102cb..961deb1ade2444065e6494fc96a2057897f24232 100644 (file)
--- a/include/wx/generic/splash.h
+++ b/include/wx/generic/splash.h
@@ -16,8 +16,13 @@
 #ifndef _WX_SPLASH_H_
 #define _WX_SPLASH_H_
 
 #ifndef _WX_SPLASH_H_
 #define _WX_SPLASH_H_
 

-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+#include "wx/bitmap.h"

 #include "wx/timer.h"
 #include "wx/timer.h"

+#endif
+
+#include "wx/frame.h"
+

 
 /*
  * A window for displaying a splash screen
 
 /*
  * A window for displaying a splash screen

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 3498795c50a8ca77c256a9e8af17117ca95b0791..9cda61529aaefba57cc68b0a9c2e531d0cb8c6a4 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -23,6 +23,7 @@
 #if wxUSE_SPLASH
 
 #ifndef WX_PRECOMP
 #if wxUSE_SPLASH
 
 #ifndef WX_PRECOMP

+#include "wx/dcmemory.h"

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