More make install tweaks.

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 2c0d403645b3919a923c816933797fd25b877049..dfb01335a6e5adf29164ed4608b140ed3fad2dc7 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -34,6 +34,8 @@
 
 #define wxSPLASH_TIMER_ID 9999
 
+IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame);
+
 BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
@@ -106,6 +108,16 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
     wxWindow(parent, id, pos, size, style)
 {
     m_bitmap = bitmap;
+
+#ifndef __WXGTK__
+    bool hiColour = (wxDisplayDepth() >= 16) ;
+
+    if (bitmap.GetPalette() && !hiColour)
+    {
+        SetPalette(* bitmap.GetPalette());
+    }
+#endif
+
 }
 
 void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
@@ -115,31 +127,34 @@ void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.DrawBitmap(m_bitmap, 0, 0);
 }
 
+// VZ: why don't we do it under wxGTK?
+#if !defined(__WXGTK__) && wxUSE_PALETTE
+    #define USE_PALETTE_IN_SPLASH
+#endif
+
 static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
 {
     wxMemoryDC dcMem;
 
-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH
     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)
     {
-        dc.SetPalette(* bitmap.GetPalette());
         dcMem.SetPalette(* bitmap.GetPalette());
     }
-#endif
+#endif // USE_PALETTE_IN_SPLASH
 
     dcMem.SelectObject(bitmap);
     dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
     dcMem.SelectObject(wxNullBitmap);
 
-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH
     if (bitmap.GetPalette() && !hiColour)
     {
-        dc.SetPalette(wxNullPalette);
         dcMem.SetPalette(wxNullPalette);
     }
-#endif
+#endif // USE_PALETTE_IN_SPLASH
 }
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)