X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2d516f26095ca280536afa9867286f9244c7aef..993da3969b28e4f80b492cc26114fb0e151163cb:/src/generic/splash.cpp diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index fd23f630b6..d498bb4e55 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "splash.h" #endif @@ -24,6 +24,7 @@ #ifndef WX_PRECOMP #include "wx/dcmemory.h" +#include "wx/dcclient.h" #endif #include "wx/splash.h" @@ -70,7 +71,7 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil 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 @@ -111,7 +112,7 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par { m_bitmap = bitmap; -#ifndef __WXGTK__ +#if !defined(__WXGTK__) && wxUSE_PALETTE bool hiColour = (wxDisplayDepth() >= 16) ; if (bitmap.GetPalette() && !hiColour)