From 25093cf311ba6bcef91a6a8cae530233c6074778 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 1 Sep 2000 16:47:04 +0000 Subject: [PATCH] Ignored palettes for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/splash.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index e274dd0a45..9cb2778415 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -111,19 +111,25 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y) bool hiColour = (wxDisplayDepth() >= 16) ; +#ifndef __WXGTK__ if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(* bitmap.GetPalette()); dcMem.SetPalette(* bitmap.GetPalette()); } +#endif + dcMem.SelectObject(bitmap); dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0); dcMem.SelectObject(wxNullBitmap); + +#ifndef __WXGTK__ if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(wxNullPalette); dcMem.SetPalette(wxNullPalette); } +#endif } void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)