X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25093cf311ba6bcef91a6a8cae530233c6074778..1fc8878582bcdab2a90b95fb713c4d088a0e2a57:/src/generic/splash.cpp diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index 9cb2778415..54c8982dc9 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -46,7 +46,14 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil m_window = new wxSplashScreenWindow(bitmap, this, -1, pos, size, wxNO_BORDER); - SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); + // For some reason, we need to make the client size a couple of pixels + // bigger for all of the bitmap to show. +#ifdef __WXMSW__ + int fudge = 2; +#else + int fudge = 0; +#endif + SetClientSize(bitmap.GetWidth()+fudge, bitmap.GetHeight()+fudge); if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT) CentreOnParent(); @@ -109,9 +116,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y) { wxMemoryDC dcMem; +#ifndef __WXGTK__ bool hiColour = (wxDisplayDepth() >= 16) ; -#ifndef __WXGTK__ if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(* bitmap.GetPalette());