use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index dfb01335a6e5adf29164ed4608b140ed3fad2dc7..d498bb4e5575fb0391b725ae85b6cdc4e9287f71 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "splash.h"
 #endif
 
 #pragma implementation "splash.h"
 #endif
 


@@ -24,6 +24,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dcmemory.h"

+#include "wx/dcclient.h"

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


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

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined(__WXMAC__)

     Update(); // Without this, you see a blank screen for an instant
 #else
     wxYieldIfNeeded(); // Should eliminate this
     Update(); // Without this, you see a blank screen for an instant
 #else
     wxYieldIfNeeded(); // Should eliminate this


@@ -98,7 +99,9 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
  */
 
 BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
  */
 
 BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)

-    //EVT_PAINT(wxSplashScreenWindow::OnPaint)
+#ifdef __WXGTK__
+    EVT_PAINT(wxSplashScreenWindow::OnPaint)
+#endif

     EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground)
     EVT_CHAR(wxSplashScreenWindow::OnChar)
     EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent)
     EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground)
     EVT_CHAR(wxSplashScreenWindow::OnChar)
     EVT_MOUSE_EVENTS(wxSplashScreenWindow::OnMouseEvent)


@@ -109,7 +112,7 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 

-#ifndef __WXGTK__
+#if !defined(__WXGTK__) && wxUSE_PALETTE

     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)
     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)


@@ -120,13 +123,6 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
 
 }
 
 
 }
 

-void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    if (m_bitmap.Ok())
-        dc.DrawBitmap(m_bitmap, 0, 0);
-}
-

 // VZ: why don't we do it under wxGTK?
 #if !defined(__WXGTK__) && wxUSE_PALETTE
     #define USE_PALETTE_IN_SPLASH
 // VZ: why don't we do it under wxGTK?
 #if !defined(__WXGTK__) && wxUSE_PALETTE
     #define USE_PALETTE_IN_SPLASH


@@ -157,6 +153,13 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
 #endif // USE_PALETTE_IN_SPLASH
 }
 
 #endif // USE_PALETTE_IN_SPLASH
 }
 

+void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+    if (m_bitmap.Ok())
+        wxDrawSplashBitmap(dc, m_bitmap, 0, 0);
+}
+

 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
 {
     if (event.GetDC())
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
 {
     if (event.GetDC())