reverted last commit, still broken for VC6

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

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index d0530eef56a88fadba33a065a6c73bda1ca8f724..91e63af911407dd71a1dc80466c0a9879d6d8964 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:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -22,6 +22,10 @@
 
 #if wxUSE_SPLASH
 
 
 #if wxUSE_SPLASH
 

+#ifdef __WXGTK20__
+    #include <gtk/gtk.h>
+#endif
+

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


@@ -29,6 +33,7 @@
 
 #include "wx/splash.h"
 
 
 #include "wx/splash.h"
 

+

 /*
  * wxSplashScreen
  */
 /*
  * wxSplashScreen
  */


@@ -50,11 +55,19 @@ END_EVENT_TABLE()
 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)
 {
 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)
 {

+    // At least for GTK+ 2.0, this hint is not available.
+#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
+#endif
+    

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

-    m_window = new wxSplashScreenWindow(bitmap, this, -1, pos, size, wxNO_BORDER);
+    m_window = new wxSplashScreenWindow(bitmap, this, wxID_ANY, pos, size, wxNO_BORDER);

 
     SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
 
 
     SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
 


@@ -66,10 +79,10 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
     if (m_splashStyle & wxSPLASH_TIMEOUT)
     {
         m_timer.SetOwner(this, wxSPLASH_TIMER_ID);
     if (m_splashStyle & wxSPLASH_TIMEOUT)
     {
         m_timer.SetOwner(this, wxSPLASH_TIMER_ID);

-        m_timer.Start(milliseconds, TRUE);
+        m_timer.Start(milliseconds, true);

     }
 
     }
 

-    Show(TRUE);
+    Show(true);

     m_window->SetFocus();
 #if defined( __WXMSW__ ) || defined(__WXMAC__)
     Update(); // Without this, you see a blank screen for an instant
     m_window->SetFocus();
 #if defined( __WXMSW__ ) || defined(__WXMAC__)
     Update(); // Without this, you see a blank screen for an instant


@@ -85,7 +98,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {
 
 void wxSplashScreen::OnNotify(wxTimerEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -182,12 +195,12 @@ void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
 void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (event.LeftDown() || event.RightDown())
 void wxSplashScreenWindow::OnMouseEvent(wxMouseEvent& event)
 {
     if (event.LeftDown() || event.RightDown())

-        GetParent()->Close(TRUE);
+        GetParent()->Close(true);

 }
 
 void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {
 }
 
 void wxSplashScreenWindow::OnChar(wxKeyEvent& WXUNUSED(event))
 {

-    GetParent()->Close(TRUE);
+    GetParent()->Close(true);

 }
 
 #endif // wxUSE_SPLASH
 }
 
 #endif // wxUSE_SPLASH