Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for the splashscreen bitmap not showing up in wxGTK.

Browse Source 
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
This commit is contained in:
Robin Dunn
2002-02-13 19:03:30 +00:00
parent 707440dc36
commit c2d516f260
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/splash.cpp
View File

@@ -98,7 +98,9 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
*/ */
BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
//EVT_PAINT(wxSplashScreenWindow::OnPaint) #ifdef __WXGTK__
EVT_PAINT(wxSplashScreenWindow::OnPaint)
#endif
EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground) EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground)
EVT_CHAR(wxSplashScreenWindow::OnChar) EVT_CHAR(wxSplashScreenWindow::OnChar)
EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent) 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? // VZ: why don't we do it under wxGTK?
#if !defined(__WXGTK__) && wxUSE_PALETTE #if !defined(__WXGTK__) && wxUSE_PALETTE
#define USE_PALETTE_IN_SPLASH #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 #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) void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
{ {
if (event.GetDC()) if (event.GetDC())