state clearly that the entire contents of generated files is generated; put special...

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 21a93efa503c12cf240fb263aff70718fcc37ce6..3fded78761c6de9d4ed3d6569b1a301b940b64dd 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        splash.cpp
+// Name:        src/generic/splash.cpp

 // Purpose:     wxSplashScreen class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSplashScreen class
 // Author:      Julian Smart
 // Modified by:


@@ -9,15 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "splash.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SPLASH
 #endif
 
 #if wxUSE_SPLASH


@@ -26,13 +22,12 @@
     #include <gtk/gtk.h>
 #endif
 
     #include <gtk/gtk.h>
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/dcmemory.h"
-#include "wx/dcclient.h"
-#endif
-

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

+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"
+#endif

 
 /*
  * wxSplashScreen
 
 /*
  * wxSplashScreen


@@ -40,7 +35,7 @@
 
 #define wxSPLASH_TIMER_ID 9999
 
 
 #define wxSPLASH_TIMER_ID 9999
 

-IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame);
+IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame)

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


@@ -53,14 +48,16 @@ END_EVENT_TABLE()
  */
 
 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, wxPoint(0, 0), wxSize(100, 100), style)
+    wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style)

 {
     // At least for GTK+ 2.0, this hint is not available.
 {
     // At least for GTK+ 2.0, this hint is not available.

-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0)
+#if defined(__WXGTK20__)
+#if GTK_CHECK_VERSION(2,2,0)

     gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                              GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
 #endif
     gtk_window_set_type_hint(GTK_WINDOW(m_widget),
                              GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
 #endif

-    
+#endif
+

     m_window = NULL;
     m_splashStyle = splashStyle;
     m_milliseconds = milliseconds;
     m_window = NULL;
     m_splashStyle = splashStyle;
     m_milliseconds = milliseconds;


@@ -152,7 +149,7 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
     }
 #endif // USE_PALETTE_IN_SPLASH
 
     }
 #endif // USE_PALETTE_IN_SPLASH
 

-    dcMem.SelectObject(bitmap);
+    dcMem.SelectObjectAsSource(bitmap);

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