Unicode compilation fix

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 54c8982dc9cc69983559a1161ed20e0441892962..2c0d403645b3919a923c816933797fd25b877049 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -6,7 +6,7 @@
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     28/6/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,8 +20,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SPLASH
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+#include "wx/dcmemory.h"

 #endif
 
 #include "wx/splash.h"
 #endif
 
 #include "wx/splash.h"


@@ -37,8 +39,13 @@ BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
 END_EVENT_TABLE()
 

+/* Note that unless we pass a non-default size to the frame, SetClientSize
+ * won't work properly under Windows, and the splash screen frame is sized
+ * slightly too small.
+ */
+

 wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
 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, pos, size, style)
+    wxFrame(parent, id, wxEmptyString, wxPoint(0, 0), wxSize(100, 100), style)

 {
     m_window = NULL;
     m_splashStyle = splashStyle;
 {
     m_window = NULL;
     m_splashStyle = splashStyle;


@@ -46,14 +53,7 @@ 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);
 

-    // For some reason, we need to make the client size a couple of pixels
-    // bigger for all of the bitmap to show.
-#ifdef __WXMSW__
-    int fudge = 2;
-#else
-    int fudge = 0;
-#endif
-    SetClientSize(bitmap.GetWidth()+fudge, bitmap.GetHeight()+fudge);
+    SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());

 
     if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
         CentreOnParent();
 
     if (m_splashStyle & wxSPLASH_CENTRE_ON_PARENT)
         CentreOnParent();


@@ -68,7 +68,11 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     Show(TRUE);
     m_window->SetFocus();
 
     Show(TRUE);
     m_window->SetFocus();

-    wxYield(); // Without this, you see a blank screen for an instant
+#ifdef __WXMSW__
+    Update(); // Without this, you see a blank screen for an instant
+#else
+    wxYieldIfNeeded(); // Should eliminate this
+#endif

 }
 
 wxSplashScreen::~wxSplashScreen()
 }
 
 wxSplashScreen::~wxSplashScreen()


@@ -76,13 +80,12 @@ wxSplashScreen::~wxSplashScreen()
     m_timer.Stop();
 }
 
     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();
 {
     m_timer.Stop();
     this->Destroy();


@@ -105,20 +108,20 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
     m_bitmap = bitmap;
 }
 
     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);
 }
 
 {
     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) ;
 {
     wxMemoryDC dcMem;
 
 #ifndef __WXGTK__
     bool hiColour = (wxDisplayDepth() >= 16) ;

-    
+

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


@@ -164,8 +167,9 @@ void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
         GetParent()->Close(TRUE);
 }
 
         GetParent()->Close(TRUE);
 }
 

-void wxSplashScreenWindow::OnChar(wxKeyEvent& event)
+void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))

 {
     GetParent()->Close(TRUE);
 }
 
 {
     GetParent()->Close(TRUE);
 }
 

+#endif // wxUSE_SPLASH