media proj

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 22ff54978c4f621b84c11c795a9533328e3af29b..db21fc0c5c6bcb9908260d29776ac9a87358863e 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -41,6 +41,10 @@
 #endif // wxUSE_STARTUP_TIPS
 
 #if wxUSE_PROGRESSDLG
 #endif // wxUSE_STARTUP_TIPS
 
 #if wxUSE_PROGRESSDLG

+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    #include <wx/datetime.h>      // wxDateTime
+#endif
+

     #include "wx/progdlg.h"
 #endif // wxUSE_PROGRESSDLG
 
     #include "wx/progdlg.h"
 #endif // wxUSE_PROGRESSDLG
 


@@ -181,6 +185,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_FIND_CLOSE(wxID_ANY, MyFrame::OnFindDialog)
 #endif // wxUSE_FINDREPLDLG
 
     EVT_FIND_CLOSE(wxID_ANY, MyFrame::OnFindDialog)
 #endif // wxUSE_FINDREPLDLG
 

+    EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention)
+

     EVT_MENU(wxID_EXIT,                             MyFrame::OnExit)
 END_EVENT_TABLE()
 
     EVT_MENU(wxID_EXIT,                             MyFrame::OnExit)
 END_EVENT_TABLE()
 


@@ -206,10 +212,6 @@ bool MyApp::OnInit()
     wxInitAllImageHandlers();
 #endif
 
     wxInitAllImageHandlers();
 #endif
 

-#if defined(__WXGTK__) && defined(wxUSE_UNICODE)
-    wxConvCurrent = &wxConvLibc;
-#endif
-

     m_canvasTextColour = wxColour(_T("BLACK"));
     m_canvasFont = *wxNORMAL_FONT;
 
     m_canvasTextColour = wxColour(_T("BLACK"));
     m_canvasFont = *wxNORMAL_FONT;
 


@@ -222,130 +224,131 @@ bool MyApp::OnInit()
     file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M"));
 
 
     file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M"));
 
 

-    #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
+#if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG

 
 

-        wxMenu *choices_menu = new wxMenu;
+    wxMenu *choices_menu = new wxMenu;

 
 

-        #if wxUSE_COLOURDLG
-            choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
-        #endif // wxUSE_COLOURDLG
+    #if wxUSE_COLOURDLG
+        choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
+    #endif // wxUSE_COLOURDLG

 
 

-        #if wxUSE_FONTDLG
-            choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font"));
-        #endif // wxUSE_FONTDLG
+    #if wxUSE_FONTDLG
+        choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font"));
+    #endif // wxUSE_FONTDLG

 
 

-        #if wxUSE_CHOICEDLG
-            choices_menu->Append(DIALOGS_SINGLE_CHOICE,  _T("&Single choice\tCtrl-C"));
-            choices_menu->Append(DIALOGS_MULTI_CHOICE,  _T("M&ultiple choice\tCtrl-U"));
-        #endif // wxUSE_CHOICEDLG
+    #if wxUSE_CHOICEDLG
+        choices_menu->Append(DIALOGS_SINGLE_CHOICE,  _T("&Single choice\tCtrl-C"));
+        choices_menu->Append(DIALOGS_MULTI_CHOICE,  _T("M&ultiple choice\tCtrl-U"));
+    #endif // wxUSE_CHOICEDLG

 
 

-        #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
-            choices_menu->AppendSeparator();
-        #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
+    #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
+        choices_menu->AppendSeparator();
+    #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC

 
 

-        #if USE_COLOURDLG_GENERIC
-            choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)"));
-        #endif // USE_COLOURDLG_GENERIC
+    #if USE_COLOURDLG_GENERIC
+        choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)"));
+    #endif // USE_COLOURDLG_GENERIC

 
 

-        #if USE_FONTDLG_GENERIC
-            choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)"));
-        #endif // USE_FONTDLG_GENERIC
+    #if USE_FONTDLG_GENERIC
+        choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)"));
+    #endif // USE_FONTDLG_GENERIC

 
 

-        file_menu->Append(wxID_ANY,_T("Choices and selectors"),choices_menu);
+    file_menu->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu);
+#endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG

 
 

-    #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG

 
 

+#if wxUSE_TEXTDLG || wxUSE_NUMBERDLG

 
 

-    #if wxUSE_TEXTDLG || wxUSE_NUMBERDLG
+    wxMenu *entry_menu = new wxMenu;

 
 

-        wxMenu *entry_menu = new wxMenu;
+    #if wxUSE_TEXTDLG
+        entry_menu->Append(DIALOGS_TEXT_ENTRY,  _T("Text &entry\tCtrl-E"));
+        entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  _T("&Password entry\tCtrl-P"));
+    #endif // wxUSE_TEXTDLG

 
 

-        #if wxUSE_TEXTDLG
-            entry_menu->Append(DIALOGS_TEXT_ENTRY,  _T("Text &entry\tCtrl-E"));
-            entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  _T("&Password entry\tCtrl-P"));
-        #endif // wxUSE_TEXTDLG
+    #if wxUSE_NUMBERDLG
+        entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N"));
+    #endif // wxUSE_NUMBERDLG

 
 

-        #if wxUSE_NUMBERDLG
-            entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N"));
-        #endif // wxUSE_NUMBERDLG
+    file_menu->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu);

 
 

-        file_menu->Append(wxID_ANY,_T("Entry dialogs"),entry_menu);
+#endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG

 
 

-    #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG

 
 

+#if wxUSE_FILEDLG

 
 

-    #if wxUSE_FILEDLG
+    wxMenu *filedlg_menu = new wxMenu;
+    filedlg_menu->Append(DIALOGS_FILE_OPEN,  _T("&Open file\tCtrl-O"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN2,  _T("&Second open file\tCtrl-2"));
+    filedlg_menu->Append(DIALOGS_FILES_OPEN,  _T("Open &files\tCtrl-Q"));
+    filedlg_menu->Append(DIALOGS_FILE_SAVE,  _T("Sa&ve file\tCtrl-S"));

 
 

-        wxMenu *filedlg_menu = new wxMenu;
-        filedlg_menu->Append(DIALOGS_FILE_OPEN,  _T("&Open file\tCtrl-O"));
-        filedlg_menu->Append(DIALOGS_FILE_OPEN2,  _T("&Second open file\tCtrl-2"));
-        filedlg_menu->Append(DIALOGS_FILES_OPEN,  _T("Open &files\tCtrl-Q"));
-        filedlg_menu->Append(DIALOGS_FILE_SAVE,  _T("Sa&ve file\tCtrl-S"));
+    #if USE_FILEDLG_GENERIC
+        filedlg_menu->AppendSeparator();
+        filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC,  _T("&Open file (generic)"));
+        filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC,  _T("Open &files (generic)"));
+        filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC,  _T("Sa&ve file (generic)"));
+    #endif // USE_FILEDLG_GENERIC

 
 

-        #if USE_FILEDLG_GENERIC
-            filedlg_menu->AppendSeparator();
-            filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC,  _T("&Open file (generic)"));
-            filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC,  _T("Open &files (generic)"));
-            filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC,  _T("Sa&ve file (generic)"));
-        #endif // USE_FILEDLG_GENERIC
+    file_menu->Append(wxID_ANY,_T("&File operations"),filedlg_menu);

 
 

-        file_menu->Append(wxID_ANY,_T("File operations"),filedlg_menu);
+#endif // wxUSE_FILEDLG

 
 

-    #endif // wxUSE_FILEDLG
+#if wxUSE_DIRDLG
+    wxMenu *dir_menu = new wxMenu;

 
 

-    #if wxUSE_DIRDLG
-        wxMenu *dir_menu = new wxMenu;
+    dir_menu->Append(DIALOGS_DIR_CHOOSE,  _T("&Choose a directory\tCtrl-D"));
+    dir_menu->Append(DIALOGS_DIRNEW_CHOOSE,  _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
+    file_menu->Append(wxID_ANY,_T("&Directory operations"),dir_menu);

 
 

-        dir_menu->Append(DIALOGS_DIR_CHOOSE,  _T("&Choose a directory\tCtrl-D"));
-        dir_menu->Append(DIALOGS_DIRNEW_CHOOSE,  _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
-        file_menu->Append(wxID_ANY,_T("Directory operations"),dir_menu);
+    #if USE_DIRDLG_GENERIC
+        dir_menu->AppendSeparator();
+        dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  _T("&Choose a directory (generic)"));
+    #endif // USE_DIRDLG_GENERIC

 
 

-        #if USE_DIRDLG_GENERIC
-            dir_menu->AppendSeparator();
-            dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  _T("&Choose a directory (generic)"));
-        #endif // USE_DIRDLG_GENERIC
+#endif // wxUSE_DIRDLG

 
 

-    #endif // wxUSE_DIRDLG

 
 

+#if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG

 
 

-    #if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG
+    wxMenu *info_menu = new wxMenu;

 
 

-        wxMenu *info_menu = new wxMenu;
+    #if wxUSE_STARTUP_TIPS
+        info_menu->Append(DIALOGS_TIP,  _T("&Tip of the day\tCtrl-T"));
+    #endif // wxUSE_STARTUP_TIPS

 
 

-        #if wxUSE_STARTUP_TIPS
-            info_menu->Append(DIALOGS_TIP,  _T("&Tip of the day\tCtrl-T"));
-        #endif // wxUSE_STARTUP_TIPS
+    #if wxUSE_PROGRESSDLG
+        info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G"));
+    #endif // wxUSE_PROGRESSDLG

 
 

-        #if wxUSE_PROGRESSDLG
-            info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G"));
-        #endif // wxUSE_PROGRESSDLG
+    #if wxUSE_BUSYINFO
+       info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
+    #endif // wxUSE_BUSYINFO

 
 

-        #if wxUSE_BUSYINFO
-           info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
-        #endif // wxUSE_BUSYINFO
+    #if wxUSE_LOG_DIALOG
+       info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L"));
+    #endif // wxUSE_LOG_DIALOG

 
 

-        #if wxUSE_LOG_DIALOG
-           info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L"));
-        #endif // wxUSE_LOG_DIALOG
+    file_menu->Append(wxID_ANY,_T("&Informative dialogs"),info_menu);

 
 

-        file_menu->Append(wxID_ANY,_T("Informative dialogs"),info_menu);
+#endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG

 
 

-    #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG

 
 

+#if wxUSE_FINDREPLDLG
+    wxMenu *find_menu = new wxMenu;
+    find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"));
+    find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"));
+    file_menu->Append(wxID_ANY,_T("&Searching"),find_menu);
+#endif // wxUSE_FINDREPLDLG

 
 

-    #if wxUSE_FINDREPLDLG
-        wxMenu *find_menu = new wxMenu;
-        find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"));
-        find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"));
-        file_menu->Append(wxID_ANY,_T("Searching"),find_menu);
-    #endif // wxUSE_FINDREPLDLG
+#if USE_MODAL_PRESENTATION
+    wxMenu *modal_menu = new wxMenu;
+    modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
+    modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"));
+    file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu);
+#endif // USE_MODAL_PRESENTATION

 
 

-    #if USE_MODAL_PRESENTATION
-        wxMenu *modal_menu = new wxMenu;
-        modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
-        modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"));
-        file_menu->Append(wxID_ANY,_T("Modal/Modeless"),modal_menu);
-    #endif // USE_MODAL_PRESENTATION
+    file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R"));

 
     file_menu->AppendSeparator();
     file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
 
     file_menu->AppendSeparator();
     file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));


@@ -385,7 +388,14 @@ MyFrame::MyFrame(wxWindow *parent,
     m_clrData.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {
     m_clrData.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {

-        m_clrData.SetCustomColour(i, wxColour(i*16, i*16, i*16));
+        m_clrData.SetCustomColour(
+          i,
+          wxColour(
+            (unsigned char)(i*16),
+            (unsigned char)(i*16),
+            (unsigned char)(i*16)
+          )
+        );

     }
 #endif // wxUSE_COLOURDLG
 
     }
 #endif // wxUSE_COLOURDLG
 


@@ -443,7 +453,11 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
     data.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {
     data.SetChooseFull(true);
     for (int i = 0; i < 16; i++)
     {

-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour(
+            (unsigned char)(i*16),
+            (unsigned char)(i*16),
+            (unsigned char)(i*16)
+        );

         data.SetCustomColour(i, colour);
     }
 
         data.SetCustomColour(i, colour);
     }
 


@@ -480,6 +494,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
 }
 #endif // USE_FONTDLG_GENERIC
 
 }
 #endif // USE_FONTDLG_GENERIC
 

+#if wxUSE_LOG_DIALOG

 void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
 {
     // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
 void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
 {
     // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages


@@ -501,6 +516,7 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
 
     wxLogMessage(wxT("And this is the same dialog but with only one message."));
 }
 
     wxLogMessage(wxT("And this is the same dialog but with only one message."));
 }

+#endif // wxUSE_LOG_DIALOG

 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {


@@ -576,8 +592,7 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 
     if (dialog.ShowModal() == wxID_OK)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxMessageDialog dialog2(this, dialog.GetValue(), _T("Got string"));
-        dialog2.ShowModal();
+        wxMessageBox(dialog.GetValue(), _T("Got string"), wxOK | wxICON_INFORMATION, this);

     }
 }
 #endif // wxUSE_TEXTDLG
     }
 }
 #endif // wxUSE_TEXTDLG


@@ -646,7 +661,7 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 #ifdef __WXMOTIF__
                     _T("C++ files (*.cpp)|*.cpp")
 #else
 #ifdef __WXMOTIF__
                     _T("C++ files (*.cpp)|*.cpp")
 #else

-                    _T("C++ files (*.h;*.cpp)|*.h;*.cpp")
+                    _T("C++ files (*.cpp;*.h)|*.cpp;*.h")

 #endif
                  );
 
 #endif
                  );
 


@@ -697,7 +712,7 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 #ifdef __WXMOTIF__
                     _T("C++ files (*.cpp)|*.cpp");
 #else
 #ifdef __WXMOTIF__
                     _T("C++ files (*.cpp)|*.cpp");
 #else

-                    _T("All files (*.*)|*.*|C++ files (*.h;*.cpp)|*.h;*.cpp");
+                    _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");

 #endif
     wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,
 #endif
     wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,


@@ -755,7 +770,7 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
                     _T("Testing open file dialog"),
                     wxEmptyString,
                     wxEmptyString,
                     _T("Testing open file dialog"),
                     wxEmptyString,
                     wxEmptyString,

-                    _T("C++ files (*.h;*.cpp)|*.h;*.cpp")
+                    _T("C++ files (*.cpp;*.h)|*.cpp;*.h")

                  );
 
     dialog.SetDirectory(wxGetHomeDir());
                  );
 
     dialog.SetDirectory(wxGetHomeDir());


@@ -776,7 +791,7 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 {

-    wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.h;*.cpp)|*.h;*.cpp");
+    wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");

     wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,
                         wxMULTIPLE);
     wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,
                         wxMULTIPLE);


@@ -923,6 +938,15 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event))
 }
 #endif // wxUSE_STARTUP_TIPS
 
 }
 #endif // wxUSE_STARTUP_TIPS
 

+void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogStatus(_T("Sleeping for 3 seconds to allow you to switch to another window"));
+
+    wxSleep(3);
+
+    RequestUserAttention(wxUSER_ATTENTION_ERROR);
+}
+

 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(true);
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(true);


@@ -932,7 +956,33 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 {

+    #if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    // check the performance
+    int countrandomnumbers = 0, count = 0;
+    wxTimeSpan tsTest(0,0,0,250);
+    wxDateTime DT2, DT1 = wxDateTime::UNow();
+    srand(0);
+    while(1)
+    {
+        rand();
+        ++countrandomnumbers;
+        if ( countrandomnumbers == 1000 )
+        {
+            srand(0);
+            countrandomnumbers = 0;
+            ++count;
+            DT2 = wxDateTime::UNow();
+            wxTimeSpan ts = DT2.Subtract( DT1 );
+            if ( ts.IsLongerThan( tsTest ) )
+            {
+                break;
+            }
+        }
+    }
+    const int max = 40 * count;
+    #else

     static const int max = 10;
     static const int max = 10;

+    #endif // wxUSE_STOPWATCH && wxUSE_LONGLONG

 
     wxProgressDialog dialog(_T("Progress dialog example"),
                             _T("An informative message"),
 
     wxProgressDialog dialog(_T("Progress dialog example"),
                             _T("An informative message"),


@@ -948,7 +998,25 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
     bool cont = true;
     for ( int i = 0; i <= max; i++ )
     {
     bool cont = true;
     for ( int i = 0; i <= max; i++ )
     {

+        #if wxUSE_STOPWATCH && wxUSE_LONGLONG
+        // do (almost) the same operations as we did for the performance test
+        srand(0);
+        for ( int j = 0; j < 1000; j++ )
+        {
+            rand();
+            if ( j == 999 )
+            {
+                DT2 = wxDateTime::UNow();
+                wxTimeSpan ts = DT2.Subtract( DT1 );
+                if ( ts.IsLongerThan( tsTest ) )
+                {
+                    // nothing to do
+                }
+            }
+        }
+        #else

         wxSleep(1);
         wxSleep(1);

+        #endif

         if ( i == max )
         {
             cont = dialog.Update(i, _T("That's all, folks!"));
         if ( i == max )
         {
             cont = dialog.Update(i, _T("That's all, folks!"));


@@ -959,9 +1027,15 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
         }
         else
         {
         }
         else
         {

+            #if wxUSE_STOPWATCH && wxUSE_LONGLONG
+            if ( (i % (max/100)) == 0 ) // // only 100 updates, this makes it much faster
+            {
+                cont = dialog.Update(i);
+            }
+            #else

             cont = dialog.Update(i);
             cont = dialog.Update(i);

+            #endif

         }
         }

-

         if ( !cont )
         {
             if ( wxMessageBox(_T("Do you really want to cancel?"),
         if ( !cont )
         {
             if ( wxMessageBox(_T("Do you really want to cancel?"),


@@ -969,6 +1043,7 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
                               wxYES_NO | wxICON_QUESTION) == wxYES )
                 break;
 
                               wxYES_NO | wxICON_QUESTION) == wxYES )
                 break;
 

+            cont = true;

             dialog.Resume();
         }
     }
             dialog.Resume();
         }
     }


@@ -1134,9 +1209,16 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
     dc.SetFont(wxGetApp().m_canvasFont);
     dc.SetTextForeground(wxGetApp().m_canvasTextColour);
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.SetFont(wxGetApp().m_canvasFont);
     dc.SetTextForeground(wxGetApp().m_canvasTextColour);
     dc.SetBackgroundMode(wxTRANSPARENT);

-    dc.DrawText(_T("wxWidgets common dialogs test application"), 10, 10);
+    dc.DrawText(
+                _T("wxWidgets common dialogs")
+#if !defined(__SMARTPHONE__)
+                _T(" test application")
+#endif
+                , 10, 10);

 }
 
 }
 

+#if USE_MODAL_PRESENTATION
+

 // ----------------------------------------------------------------------------
 // MyModelessDialog
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MyModelessDialog
 // ----------------------------------------------------------------------------


@@ -1233,3 +1315,6 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
         event.Skip();
     }
 }
         event.Skip();
     }
 }

+
+#endif // USE_MODAL_PRESENTATION
+