Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / src / generic / splash.cpp

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index e274dd0a45cf6ee854765b534da96b09c17f7cb0..c101144cbc96a3569ff6bd2fc02f4e3df3a076f2 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -1,50 +1,80 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        splash.cpp
+// Name:        src/generic/splash.cpp

 // Purpose:     wxSplashScreen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxSplashScreen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// 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__
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/wx.h"
+#if wxUSE_SPLASH
+
+#ifdef __WXGTK20__
+    #include <gtk/gtk.h>

 #endif
 
 #include "wx/splash.h"
 
 #endif
 
 #include "wx/splash.h"
 

-/*
- * wxSplashScreen
- */
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"
+#endif

 
 

-#define wxSPLASH_TIMER_ID 9999

 
 

+// ----------------------------------------------------------------------------
+// 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()
 
 BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
 END_EVENT_TABLE()
 

-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, pos, size, style)
+void wxSplashScreen::Init()

 {
     m_window = NULL;
 {
     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 | wxFRAME_TOOL_WINDOW | wxFRAME_NO_TASKBAR)
+{
+    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_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());
 
 
     SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
 


@@ -56,103 +86,128 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
     if (m_splashStyle & wxSPLASH_TIMEOUT)
     {
         m_timer.SetOwner(this, wxSPLASH_TIMER_ID);
     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();
     m_window->SetFocus();

-    wxYield(); // Without this, you see a blank screen for an instant
+#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

 }
 
 wxSplashScreen::~wxSplashScreen()
 {
     m_timer.Stop();
 }
 
 wxSplashScreen::~wxSplashScreen()
 {
     m_timer.Stop();

+
+    wxEvtHandler::RemoveFilter(this);

 }
 
 }
 

-void wxSplashScreen::OnNotify(wxTimerEvent& event)
+int wxSplashScreen::FilterEvent(wxEvent& event)

 {
 {

-    m_timer.Stop();
-    this->Destroy();
+    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);

 }
 
 }
 

-void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)
+void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     m_timer.Stop();
     this->Destroy();
 }
 
 {
     m_timer.Stop();
     this->Destroy();
 }
 

-/*
- * wxSplashScreenWindow
- */
+// ----------------------------------------------------------------------------
+// wxSplashScreenWindow
+// ----------------------------------------------------------------------------

 
 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_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent)

 END_EVENT_TABLE()
 
 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;
 {
     m_bitmap = bitmap;

-}

 
 

-void wxSplashScreenWindow::OnPaint(wxPaintEvent& event)
-{
-    wxPaintDC dc(this);
-    if (m_bitmap.Ok())
-        dc.DrawBitmap(m_bitmap, 0, 0);
+#if !defined(__WXGTK__) && wxUSE_PALETTE
+    bool hiColour = (wxDisplayDepth() >= 16) ;
+
+    if (bitmap.GetPalette() && !hiColour)
+    {
+        SetPalette(* bitmap.GetPalette());
+    }
+#endif

 }
 
 }
 

-static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
+// VZ: why don't we do it under wxGTK?
+#if !defined(__WXGTK__) && wxUSE_PALETTE
+    #define USE_PALETTE_IN_SPLASH
+#endif
+
+static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))

 {
     wxMemoryDC dcMem;
 
 {
     wxMemoryDC dcMem;
 

+#ifdef USE_PALETTE_IN_SPLASH

     bool hiColour = (wxDisplayDepth() >= 16) ;
     bool hiColour = (wxDisplayDepth() >= 16) ;

-    
+

     if (bitmap.GetPalette() && !hiColour)
     {
     if (bitmap.GetPalette() && !hiColour)
     {

-        dc.SetPalette(* bitmap.GetPalette());

         dcMem.SetPalette(* bitmap.GetPalette());
     }
         dcMem.SetPalette(* bitmap.GetPalette());
     }

-    dcMem.SelectObject(bitmap);
-    dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
+#endif // USE_PALETTE_IN_SPLASH
+
+    dcMem.SelectObjectAsSource(bitmap);
+    dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), &dcMem, 0, 0, wxCOPY,
+            true /* use mask */);

     dcMem.SelectObject(wxNullBitmap);
     dcMem.SelectObject(wxNullBitmap);

+
+#ifdef USE_PALETTE_IN_SPLASH

     if (bitmap.GetPalette() && !hiColour)
     {
     if (bitmap.GetPalette() && !hiColour)
     {

-        dc.SetPalette(wxNullPalette);

         dcMem.SetPalette(wxNullPalette);
     }
         dcMem.SetPalette(wxNullPalette);
     }

+#endif // USE_PALETTE_IN_SPLASH
+}
+
+void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+    if (m_bitmap.IsOk())
+        wxDrawSplashBitmap(dc, m_bitmap, 0, 0);

 }
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
 {
 }
 
 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);
     }
     else
     {
         wxClientDC dc(this);

-        if (m_bitmap.Ok())
-        {
+        if (m_bitmap.IsOk())

             wxDrawSplashBitmap(dc, m_bitmap, 0, 0);
             wxDrawSplashBitmap(dc, m_bitmap, 0, 0);

-        }

     }
 }
 
     }
 }
 

-void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
-{
-    if (event.LeftDown() || event.RightDown())
-        GetParent()->Close(TRUE);
-}
-
-void wxSplashScreenWindow::OnChar(wxKeyEvent& event)
-{
-    GetParent()->Close(TRUE);
-}
-
+#endif // wxUSE_SPLASH