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 9cb2778415c5405b425999bea037894f372820bf..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);
 
 
     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();
 
     if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
         CentreOnParent();


@@ -71,8 +79,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {

-    m_timer.Stop();
-    this->Destroy();
+    Close(TRUE);

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


@@ -109,9 +116,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
 {
     wxMemoryDC dcMem;
 
 {
     wxMemoryDC dcMem;
 

+#ifndef __WXGTK__

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

-#ifndef __WXGTK__

     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());