Applied patch [ 668155 ] Refresh problem when msgbox is shown

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 2c0d403645b3919a923c816933797fd25b877049..fa641bdf1e069c009241dc9acde7016e84846166 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -34,6 +34,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)


@@ -96,7 +98,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)


@@ -106,40 +110,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)