X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78ee2a2814c1309551fe7ea5f5c1815898fdfaa9..da98e15760bfcad41a5579e64955caadc2e535f3:/samples/splash/splash.cpp?ds=sidebyside

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index d842e0a282..95abd367cd 100644
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/image.h"
 #include "wx/splash.h"
+#include "wx/mediactrl.h"
 
 // ----------------------------------------------------------------------------
 // resources
@@ -118,19 +119,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);
@@ -194,16 +195,22 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     {
         wxImage image = bitmap.ConvertToImage();
         image.Rescale( bitmap.GetWidth()/2, bitmap.GetHeight()/2 );
-        bitmap = wxBitmap(image); 
+        bitmap = wxBitmap(image);
         wxSplashScreen *splash = new wxSplashScreen(bitmap,
             wxSPLASH_CENTRE_ON_PARENT | wxSPLASH_NO_TIMEOUT,
             0, this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
             wxSIMPLE_BORDER|wxSTAY_ON_TOP);
-        wxStaticText *text = new wxStaticText( splash->GetSplashWindow(), wxID_EXIT, _T("click somewhere\non image"), wxPoint(13,11) );
+        wxWindow *win = splash->GetSplashWindow();
+#if wxUSE_MEDIACTRL
+        wxMediaCtrl *media = new wxMediaCtrl( win, wxID_EXIT, _T("press.mpg"), wxPoint(2,2));
+        media->Play();
+#else
+        wxStaticText *text = new wxStaticText( win, wxID_EXIT, _T("click somewhere\non image"), wxPoint(13,11) );
         text->SetBackgroundColour(*wxWHITE);
         text->SetForegroundColour(*wxBLACK);
         wxFont font = text->GetFont();
         font.SetPointSize(2*font.GetPointSize()/3);
         text->SetFont(font);
+#endif
     }
 }