use the window default colours, not hardcoded ones, in OnSysColourChanged()

[wxWidgets.git] / src / generic / splash.cpp

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index fd23f630b63d2f4c139cc9fa90e90879b6a24ca4..d498bb4e5575fb0391b725ae85b6cdc4e9287f71 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "splash.h"
 #endif
 
 #pragma implementation "splash.h"
 #endif
 


@@ -24,6 +24,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dcmemory.h"

+#include "wx/dcclient.h"

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


@@ -70,7 +71,7 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     Show(TRUE);
     m_window->SetFocus();
 
     Show(TRUE);
     m_window->SetFocus();

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined(__WXMAC__)

     Update(); // Without this, you see a blank screen for an instant
 #else
     wxYieldIfNeeded(); // Should eliminate this
     Update(); // Without this, you see a blank screen for an instant
 #else
     wxYieldIfNeeded(); // Should eliminate this


@@ -111,7 +112,7 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 

-#ifndef __WXGTK__
+#if !defined(__WXGTK__) && wxUSE_PALETTE

     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)
     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)