/////////////////////////////////////////////////////////////////////////////
-// Name: splash.cpp
+// Name: src/generic/splash.cpp
// Purpose: wxSplashScreen class
// Author: Julian Smart
// Modified by:
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_SPLASH
#include <gtk/gtk.h>
#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)
* 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.
+ // 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__)
-#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_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
this->Destroy();
}
-/*
- * wxSplashScreenWindow
- */
+// ----------------------------------------------------------------------------
+// wxSplashScreenWindow
+// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
#ifdef __WXGTK__
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;
SetPalette(* bitmap.GetPalette());
}
#endif
-
}
// VZ: why don't we do it under wxGTK?
}
#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
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);
- }
}
}
{
if (event.LeftDown() || event.RightDown())
GetParent()->Close(true);
+ else
+ event.Skip();
}
void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))