Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / samples / splash / splash.cpp

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index d842e0a28224f088791f9f8dffc7479788ce6b14..9fe6957fe7b1946e09e00bc6df55ab28b482867a 100644 (file)
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/image.h"
 #include "wx/splash.h"
 
 #include "wx/image.h"
 #include "wx/splash.h"

+#include "wx/mediactrl.h"

 
 // ----------------------------------------------------------------------------
 // resources
 
 // ----------------------------------------------------------------------------
 // resources


@@ -43,6 +44,10 @@
     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

+// for smartphone, pda and other small screens use resized embedded image
+// instead of full colour png dedicated to desktops
+#include "mobile.xpm"
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -71,6 +76,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

+    bool m_isPda;
+

 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 private:
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()


@@ -118,19 +125,27 @@ bool MyApp::OnInit()
 {
     wxImage::AddHandler(new wxPNGHandler);
 
 {
     wxImage::AddHandler(new wxPNGHandler);
 

+    // create the main application window
+    MyFrame *frame = new MyFrame(_T("wxSplashScreen sample application"));
+

     wxBitmap bitmap;
     wxBitmap bitmap;

-    if (bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG))
+
+    if (frame->m_isPda)
+        bitmap = wxBitmap(mobile_xpm);
+
+    bool ok = frame->m_isPda
+            ? bitmap.Ok()
+            : bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
+
+    if (ok)

     {
         new wxSplashScreen(bitmap,
             wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
     {
         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();
 
             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);
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show(true);


@@ -149,6 +164,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {

+    m_isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+

     // set the frame icon
     SetIcon(wxICON(sample));
 
     // set the frame icon
     SetIcon(wxICON(sample));
 


@@ -190,20 +207,40 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmap bitmap;
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmap bitmap;

-    if (bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG))
+
+    if (m_isPda) bitmap = wxBitmap(mobile_xpm);
+
+    bool ok = m_isPda
+            ? bitmap.Ok()
+            : bitmap.LoadFile(_T("splash.png"), wxBITMAP_TYPE_PNG);
+
+    if (ok)

     {
         wxImage image = bitmap.ConvertToImage();
     {
         wxImage image = bitmap.ConvertToImage();

-        image.Rescale( bitmap.GetWidth()/2, bitmap.GetHeight()/2 );
-        bitmap = wxBitmap(image); 
+        // do not scale on already small screens
+        if (!m_isPda)
+            image.Rescale( bitmap.GetWidth()/2, bitmap.GetHeight()/2 );
+        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);
         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(m_isPda ? 0 : 13,
+                                                       m_isPda ? 0 : 11)
+                                             );

         text->SetBackgroundColour(*wxWHITE);
         text->SetForegroundColour(*wxBLACK);
         wxFont font = text->GetFont();
         font.SetPointSize(2*font.GetPointSize()/3);
         text->SetFont(font);
         text->SetBackgroundColour(*wxWHITE);
         text->SetForegroundColour(*wxBLACK);
         wxFont font = text->GetFont();
         font.SetPointSize(2*font.GetPointSize()/3);
         text->SetFont(font);

+#endif

     }
 }
     }
 }