because gcc is dumb and can't tell the difference between a std::string and a wxString

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index fd23f630b63d2f4c139cc9fa90e90879b6a24ca4..91e63af911407dd71a1dc80466c0a9879d6d8964 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "splash.h"
 #endif
 
@@ -22,12 +22,18 @@
 
 #if wxUSE_SPLASH
 
+#ifdef __WXGTK20__
+    #include <gtk/gtk.h>
+#endif
+
 #ifndef WX_PRECOMP
 #include "wx/dcmemory.h"
+#include "wx/dcclient.h"
 #endif
 
 #include "wx/splash.h"
 
+
 /*
  * wxSplashScreen
  */
@@ -49,11 +55,19 @@ 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, 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;
 
-    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,12 +79,12 @@ 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
 #else
     wxYieldIfNeeded(); // Should eliminate this
@@ -84,7 +98,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
@@ -111,7 +125,7 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
 {
     m_bitmap = bitmap;
 
-#ifndef __WXGTK__
+#if !defined(__WXGTK__) && wxUSE_PALETTE
     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)
@@ -181,12 +195,12 @@ void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
 void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (event.LeftDown() || event.RightDown())
-        GetParent()->Close(TRUE);
+        GetParent()->Close(true);
 }
 
 void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {
-    GetParent()->Close(TRUE);
+    GetParent()->Close(true);
 }
 
 #endif // wxUSE_SPLASH