corrected use of Print Manager Session APIs for Carbon targets

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 54c8982dc9cc69983559a1161ed20e0441892962..44cc6600ca3fa084cc95345111b6a489bb130746 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
@@ -76,13 +77,12 @@ wxSplashScreen::~wxSplashScreen()
     m_timer.Stop();
 }
 
-void wxSplashScreen::OnNotify(wxTimerEvent& event)
+void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {
-    m_timer.Stop();
-    this->Destroy();
+    Close(TRUE);
 }
 
-void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)
+void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
     m_timer.Stop();
     this->Destroy();
@@ -105,20 +105,20 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
     m_bitmap = bitmap;
 }
 
-void wxSplashScreenWindow::OnPaint(wxPaintEvent& event)
+void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
     if (m_bitmap.Ok())
         dc.DrawBitmap(m_bitmap, 0, 0);
 }
 
-static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
+static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
 {
     wxMemoryDC dcMem;
 
 #ifndef __WXGTK__
     bool hiColour = (wxDisplayDepth() >= 16) ;
-    
+
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
@@ -164,7 +164,7 @@ void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
         GetParent()->Close(TRUE);
 }
 
-void wxSplashScreenWindow::OnChar(wxKeyEvent& event)
+void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {
     GetParent()->Close(TRUE);
 }