X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95561814d90d64fbe382d06575555a8c5961e7cb..9b49405777342458dc1666001865eef7309b6c30:/src/generic/splash.cpp?ds=sidebyside diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index 91e63af911..d6111ff77b 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: splash.cpp +// Name: src/generic/splash.cpp // Purpose: wxSplashScreen class // Author: Julian Smart // Modified by: @@ -9,15 +9,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "splash.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SPLASH @@ -26,22 +22,21 @@ #include #endif -#ifndef WX_PRECOMP -#include "wx/dcmemory.h" -#include "wx/dcclient.h" -#endif - #include "wx/splash.h" +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" + #include "wx/dcclient.h" +#endif -/* - * wxSplashScreen - */ -#define wxSPLASH_TIMER_ID 9999 +// ---------------------------------------------------------------------------- +// wxSplashScreen +// ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame); +#define wxSPLASH_TIMER_ID 9999 +IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame) BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame) EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify) EVT_CLOSE(wxSplashScreen::OnCloseWindow) @@ -52,17 +47,16 @@ END_EVENT_TABLE() * slightly too small. */ -wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style): - wxFrame(parent, id, wxEmptyString, wxPoint(0, 0), wxSize(100, 100), style) +wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, + wxWindow* parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style) + : wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style) { - // At least for GTK+ 2.0, this hint is not available. #if defined(__WXGTK20__) -#if GTK_CHECK_VERSION(2,2,0) gtk_window_set_type_hint(GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); #endif -#endif - + m_window = NULL; m_splashStyle = splashStyle; m_milliseconds = milliseconds; @@ -86,6 +80,8 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil m_window->SetFocus(); #if defined( __WXMSW__ ) || defined(__WXMAC__) Update(); // Without this, you see a blank screen for an instant +#elif defined(__WXGTK20__) + // we don't need to do anything at least on wxGTK with GTK+ 2.12.9 #else wxYieldIfNeeded(); // Should eliminate this #endif @@ -107,9 +103,9 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) this->Destroy(); } -/* - * wxSplashScreenWindow - */ +// ---------------------------------------------------------------------------- +// wxSplashScreenWindow +// ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) #ifdef __WXGTK__ @@ -120,8 +116,10 @@ BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent) END_EVENT_TABLE() -wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style): - wxWindow(parent, id, pos, size, style) +wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, + wxWindowID id, const wxPoint& pos, + const wxSize& size, long style) + : wxWindow(parent, id, pos, size, style) { m_bitmap = bitmap; @@ -133,7 +131,6 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par SetPalette(* bitmap.GetPalette()); } #endif - } // VZ: why don't we do it under wxGTK? @@ -154,8 +151,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x) } #endif // USE_PALETTE_IN_SPLASH - dcMem.SelectObject(bitmap); - dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0); + dcMem.SelectObjectAsSource(bitmap); + dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), &dcMem, 0, 0, wxCOPY, + true /* use mask */); dcMem.SelectObject(wxNullBitmap); #ifdef USE_PALETTE_IN_SPLASH @@ -175,20 +173,15 @@ void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) { - if (event.GetDC()) + if (event.GetDC() && m_bitmap.Ok()) { - if (m_bitmap.Ok()) - { - wxDrawSplashBitmap(* event.GetDC(), m_bitmap, 0, 0); - } + wxDrawSplashBitmap(* event.GetDC(), m_bitmap, 0, 0); } else { wxClientDC dc(this); if (m_bitmap.Ok()) - { wxDrawSplashBitmap(dc, m_bitmap, 0, 0); - } } } @@ -196,6 +189,8 @@ void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event) { if (event.LeftDown() || event.RightDown()) GetParent()->Close(true); + else + event.Skip(); } void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))