From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 5 Aug 2004 15:08:33 +0000 (+0000)
Subject: Make wxSplashScreen with parent so it ends immediatelly if we close main frame very... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/77f5549a2b8bc550b276a6d84589a0d47dbbf50b

Make wxSplashScreen with parent so it ends immediatelly if we close main frame very quickly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index d842e0a282..4791c1f4c0 100644
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -118,19 +118,19 @@ bool MyApp::OnInit()
 {
     wxImage::AddHandler(new wxPNGHandler);
 
+    // create the main application window
+    MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
+
     wxBitmap bitmap;
     if (bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG))
     {
         new wxSplashScreen(bitmap,
             wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
-            6000, NULL, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+            6000, frame, wxID_ANY, wxDefaultPosition, wxDefaultSize,
             wxSIMPLE_BORDER|wxSTAY_ON_TOP);
     }
     wxYield();
 
-    // create the main application window
-    MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
-
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show(true);