X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2d516f26095ca280536afa9867286f9244c7aef..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/splash.cpp?ds=sidebyside diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index fd23f630b6..c101144cbc 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,51 +9,72 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#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 -#ifndef WX_PRECOMP -#include "wx/dcmemory.h" +#ifdef __WXGTK20__ + #include #endif #include "wx/splash.h" -/* - * wxSplashScreen - */ +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" + #include "wx/dcclient.h" +#endif -#define wxSPLASH_TIMER_ID 9999 -IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame); +// ---------------------------------------------------------------------------- +// wxSplashScreen +// ---------------------------------------------------------------------------- +#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) END_EVENT_TABLE() +void wxSplashScreen::Init() +{ + m_window = NULL; + + wxEvtHandler::AddFilter(this); +} + /* Note that unless we pass a non-default size to the frame, SetClientSize * won't work properly under Windows, and the splash screen frame is sized * 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 | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR) { - m_window = NULL; + Init(); + + // splash screen must not be used as parent by the other windows because it + // is going to disappear soon, indicate it by giving it this special style + SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); + +#if defined(__WXGTK20__) + gtk_window_set_type_hint(GTK_WINDOW(m_widget), + GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); +#endif + m_splashStyle = splashStyle; m_milliseconds = milliseconds; - m_window = new wxSplashScreenWindow(bitmap, this, -1, pos, size, wxNO_BORDER); + m_window = new wxSplashScreenWindow(bitmap, this, wxID_ANY, pos, size, wxNO_BORDER); SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); @@ -65,13 +86,15 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil if (m_splashStyle & wxSPLASH_TIMEOUT) { m_timer.SetOwner(this, wxSPLASH_TIMER_ID); - m_timer.Start(milliseconds, TRUE); + m_timer.Start(milliseconds, true); } - Show(TRUE); + Show(true); m_window->SetFocus(); -#ifdef __WXMSW__ +#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 @@ -80,11 +103,25 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil wxSplashScreen::~wxSplashScreen() { m_timer.Stop(); + + wxEvtHandler::RemoveFilter(this); +} + +int wxSplashScreen::FilterEvent(wxEvent& event) +{ + const wxEventType t = event.GetEventType(); + if ( t == wxEVT_KEY_DOWN || + t == wxEVT_LEFT_DOWN || + t == wxEVT_RIGHT_DOWN || + t == wxEVT_MIDDLE_DOWN ) + Close(true); + + return -1; } void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) @@ -93,25 +130,25 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) this->Destroy(); } -/* - * wxSplashScreenWindow - */ +// ---------------------------------------------------------------------------- +// wxSplashScreenWindow +// ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow) #ifdef __WXGTK__ EVT_PAINT(wxSplashScreenWindow::OnPaint) #endif EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground) - EVT_CHAR(wxSplashScreenWindow::OnChar) - 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; -#ifndef __WXGTK__ +#if !defined(__WXGTK__) && wxUSE_PALETTE bool hiColour = (wxDisplayDepth() >= 16) ; if (bitmap.GetPalette() && !hiColour) @@ -119,7 +156,6 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par SetPalette(* bitmap.GetPalette()); } #endif - } // VZ: why don't we do it under wxGTK? @@ -140,8 +176,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 @@ -155,38 +192,22 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x) void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); } void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) { - if (event.GetDC()) + if (event.GetDC() && m_bitmap.IsOk()) { - 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()) - { + if (m_bitmap.IsOk()) wxDrawSplashBitmap(dc, m_bitmap, 0, 0); - } } } -void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event) -{ - if (event.LeftDown() || event.RightDown()) - GetParent()->Close(TRUE); -} - -void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event)) -{ - GetParent()->Close(TRUE); -} - #endif // wxUSE_SPLASH