Too quick a trigger finger first time. Compile error fixed.

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index e274dd0a45cf6ee854765b534da96b09c17f7cb0..1f7932c5a61b2d5ce30bc9804d3f17ee5bc5174f 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -46,7 +46,15 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     m_window = new wxSplashScreenWindow(bitmap, this, -1, pos, size, wxNO_BORDER);
 
-    SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
+    // For some reason, we need to make the client size a couple of pixels
+    // bigger for all of the bitmap to show.
+    // Or do we?
+#ifdef __WXMSW__
+    int fudge = 0;
+#else
+    int fudge = 0;
+#endif
+    SetClientSize(bitmap.GetWidth()+fudge, bitmap.GetHeight()+fudge);
 
     if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
         CentreOnParent();
@@ -71,8 +79,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {
-    m_timer.Stop();
-    this->Destroy();
+    Close(TRUE);
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)
@@ -109,6 +116,7 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
 {
     wxMemoryDC dcMem;
 
+#ifndef __WXGTK__
     bool hiColour = (wxDisplayDepth() >= 16) ;
     
     if (bitmap.GetPalette() && !hiColour)
@@ -116,14 +124,19 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
         dc.SetPalette(* bitmap.GetPalette());
         dcMem.SetPalette(* bitmap.GetPalette());
     }
+#endif
+
     dcMem.SelectObject(bitmap);
     dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
     dcMem.SelectObject(wxNullBitmap);
+
+#ifndef __WXGTK__
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(wxNullPalette);
         dcMem.SetPalette(wxNullPalette);
     }
+#endif
 }
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)