no real change; just add the standard separator where it's missing

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index d498bb4e5575fb0391b725ae85b6cdc4e9287f71..d6111ff77b87e00b3f13d5f4b6e78ca80924aa6f 100644 (file)
--- 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:
 // Purpose:     wxSplashScreen class
 // Author:      Julian Smart
 // Modified by:


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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SPLASH
 
 #endif
 
 #if wxUSE_SPLASH
 

-#ifndef WX_PRECOMP
-#include "wx/dcmemory.h"
-#include "wx/dcclient.h"
+#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
+// ----------------------------------------------------------------------------

 
 

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


@@ -47,14 +47,21 @@ END_EVENT_TABLE()
  * slightly too small.
  */
 
  * 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)

 {
 {

+#if defined(__WXGTK20__)
+    gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+                             GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+#endif
+

     m_window = NULL;
     m_splashStyle = splashStyle;
     m_milliseconds = milliseconds;
 
     m_window = NULL;
     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());
 


@@ -66,13 +73,15 @@ 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();
 #if defined( __WXMSW__ ) || defined(__WXMAC__)
     Update(); // Without this, you see a blank screen for an instant
     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
 #else
     wxYieldIfNeeded(); // Should eliminate this
 #endif


@@ -85,7 +94,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {
 
 void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -94,9 +103,9 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     this->Destroy();
 }
 
     this->Destroy();
 }
 

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

 
 BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
 #ifdef __WXGTK__
 
 BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
 #ifdef __WXGTK__


@@ -107,8 +116,10 @@ BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
     EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent)
 END_EVENT_TABLE()
 
     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;
 
 {
     m_bitmap = bitmap;
 


@@ -120,7 +131,6 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
         SetPalette(* bitmap.GetPalette());
     }
 #endif
         SetPalette(* bitmap.GetPalette());
     }
 #endif

-

 }
 
 // VZ: why don't we do it under wxGTK?
 }
 
 // VZ: why don't we do it under wxGTK?


@@ -141,8 +151,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
     }
 #endif // USE_PALETTE_IN_SPLASH
 
     }
 #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
     dcMem.SelectObject(wxNullBitmap);
 
 #ifdef USE_PALETTE_IN_SPLASH


@@ -162,32 +173,29 @@ void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& 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())
     }
     else
     {
         wxClientDC dc(this);
         if (m_bitmap.Ok())

-        {

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

-        }

     }
 }
 
 void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (event.LeftDown() || event.RightDown())
     }
 }
 
 void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (event.LeftDown() || event.RightDown())

-        GetParent()->Close(TRUE);
+        GetParent()->Close(true);
+    else
+        event.Skip();

 }
 
 void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {
 }
 
 void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {

-    GetParent()->Close(TRUE);
+    GetParent()->Close(true);

 }
 
 #endif // wxUSE_SPLASH
 }
 
 #endif // wxUSE_SPLASH