Updates to OS/2 makefiles.

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index a407dd1653ff7586e93575324fe97de2ea7340dc..1f7932c5a61b2d5ce30bc9804d3f17ee5bc5174f 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -48,8 +48,9 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     // 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 = 2;
+    int fudge = 0;
 #else
     int fudge = 0;
 #endif
@@ -78,8 +79,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {
-    m_timer.Stop();
-    this->Destroy();
+    Close(TRUE);
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)
@@ -116,9 +116,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
 {
     wxMemoryDC dcMem;
 
+#ifndef __WXGTK__
     bool hiColour = (wxDisplayDepth() >= 16) ;
     
-#ifndef __WXGTK__
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());