1. changed wxColourData default palette to NULL colours instead of white

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 938f6b78ba4c564c9b7f4b93c18af901f0b6ba07..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"


@@ -34,6 +35,8 @@
 
 #define wxSPLASH_TIMER_ID 9999
 
 
 #define wxSPLASH_TIMER_ID 9999
 

+IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame);
+

 BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
 BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)


@@ -68,7 +71,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
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
+    Update(); // Without this, you see a blank screen for an instant
+#else
+    wxYieldIfNeeded(); // Should eliminate this
+#endif

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


@@ -92,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)


@@ -102,40 +111,53 @@ wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* par
     wxWindow(parent, id, pos, size, style)
 {
     m_bitmap = bitmap;
     wxWindow(parent, id, pos, size, style)
 {
     m_bitmap = bitmap;

-}

 
 

-void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    if (m_bitmap.Ok())
-        dc.DrawBitmap(m_bitmap, 0, 0);
+#if !defined(__WXGTK__) && wxUSE_PALETTE
+    bool hiColour = (wxDisplayDepth() >= 16) ;
+
+    if (bitmap.GetPalette() && !hiColour)
+    {
+        SetPalette(* bitmap.GetPalette());
+    }
+#endif
+

 }
 
 }
 

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

 static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
 {
     wxMemoryDC dcMem;
 
 static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
 {
     wxMemoryDC dcMem;
 

-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH

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

-        dc.SetPalette(* bitmap.GetPalette());

         dcMem.SetPalette(* bitmap.GetPalette());
     }
         dcMem.SetPalette(* bitmap.GetPalette());
     }

-#endif
+#endif // USE_PALETTE_IN_SPLASH

 
     dcMem.SelectObject(bitmap);
     dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
     dcMem.SelectObject(wxNullBitmap);
 
 
     dcMem.SelectObject(bitmap);
     dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
     dcMem.SelectObject(wxNullBitmap);
 

-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH

     if (bitmap.GetPalette() && !hiColour)
     {
     if (bitmap.GetPalette() && !hiColour)
     {

-        dc.SetPalette(wxNullPalette);

         dcMem.SetPalette(wxNullPalette);
     }
         dcMem.SetPalette(wxNullPalette);
     }

-#endif
+#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)
 }
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)