From c2d516f26095ca280536afa9867286f9244c7aef Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 13 Feb 2002 19:03:30 +0000 Subject: [PATCH] Fix for the splashscreen bitmap not showing up in wxGTK. NOTE: This is just a band-aid fix. Someone (Robert?) should really check why the wxEraseEvent was not sent to this window at all! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/splash.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index dfb01335a6..fd23f630b6 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -98,7 +98,9 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) */ BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) - //EVT_PAINT(wxSplashScreenWindow::OnPaint) +#ifdef __WXGTK__ + EVT_PAINT(wxSplashScreenWindow::OnPaint) +#endif EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground) EVT_CHAR(wxSplashScreenWindow::OnChar) EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent) @@ -120,13 +122,6 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par } -void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - wxPaintDC dc(this); - if (m_bitmap.Ok()) - 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 @@ -157,6 +152,13 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x) #endif // USE_PALETTE_IN_SPLASH } +void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + wxPaintDC dc(this); + if (m_bitmap.Ok()) + wxDrawSplashBitmap(dc, m_bitmap, 0, 0); +} + void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) { if (event.GetDC()) -- 2.45.2