X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daf3246330c8ae7b4536cd1f6deef733a405cecd..0f00be4b33cdf013af6b64bfbd0e6841e7f0d574:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 598fe7f515..fecd4b0ec3 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -41,6 +41,10 @@ #endif // wxUSE_STARTUP_TIPS #if wxUSE_PROGRESSDLG +#if wxUSE_STOPWATCH && wxUSE_LONGLONG + #include // wxDateTime +#endif + #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_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention) + EVT_MENU(wxID_EXIT, MyFrame::OnExit) END_EVENT_TABLE() @@ -206,10 +212,6 @@ bool MyApp::OnInit() wxInitAllImageHandlers(); #endif -#if defined(__WXGTK__) && defined(wxUSE_UNICODE) - wxConvCurrent = &wxConvLibc; -#endif - 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")); - #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")); @@ -385,7 +388,14 @@ MyFrame::MyFrame(wxWindow *parent, 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 @@ -411,6 +421,36 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) } #endif // wxUSE_COLOURDLG +#if USE_COLOURDLG_GENERIC +void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) +{ + m_clrData.SetColour(myCanvas->GetBackgroundColour()); + + //FIXME:TODO:This has no effect... + m_clrData.SetChooseFull(true); + + for (int i = 0; i < 16; i++) + { + wxColour colour( + (unsigned char)(i*16), + (unsigned char)(i*16), + (unsigned char)(i*16) + ); + m_clrData.SetCustomColour(i, colour); + } + + wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &m_clrData); + if (dialog->ShowModal() == wxID_OK) + { + m_clrData = dialog->GetColourData(); + myCanvas->SetBackgroundColour(m_clrData.GetColour()); + myCanvas->ClearBackground(); + myCanvas->Refresh(); + } + dialog->Destroy(); +} +#endif // USE_COLOURDLG_GENERIC + #if wxUSE_FONTDLG void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) { @@ -436,31 +476,6 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) } #endif // wxUSE_FONTDLG -#if USE_COLOURDLG_GENERIC -void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) -{ - wxColourData data; - data.SetChooseFull(true); - for (int i = 0; i < 16; i++) - { - wxColour colour(i*16, i*16, i*16); - data.SetCustomColour(i, colour); - } - - wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data); - if (dialog->ShowModal() == wxID_OK) - { - wxColourData retData = dialog->GetColourData(); - wxColour col = retData.GetColour(); -// wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); - myCanvas->SetBackgroundColour(col); - myCanvas->ClearBackground(); - myCanvas->Refresh(); - } - dialog->Destroy(); -} -#endif // USE_COLOURDLG_GENERIC - #if USE_FONTDLG_GENERIC void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) { @@ -560,7 +575,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event)) _T("Password entry dialog"), wxEmptyString, this); - if ( !!pwd ) + if ( !pwd.empty() ) { wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()), _T("Got password"), wxOK | wxICON_INFORMATION, this); @@ -890,7 +905,14 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } else // hide { - m_dialog->Hide(); + // If m_dialog is NULL, then possibly the system + // didn't report the checked menu item status correctly. + // It should be true just after the menu item was selected, + // if there was no modeless dialog yet. + + wxASSERT( m_dialog != NULL ); + if (m_dialog) + m_dialog->Hide(); } } #endif // USE_MODAL_PRESENTATION @@ -924,6 +946,15 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) } #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); @@ -933,35 +964,91 @@ void MyFrame::OnExit(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; + #endif // wxUSE_STOPWATCH && wxUSE_LONGLONG wxProgressDialog dialog(_T("Progress dialog example"), _T("An informative message"), max, // range this, // parent wxPD_CAN_ABORT | + wxPD_CAN_SKIP | wxPD_APP_MODAL | // wxPD_AUTO_HIDE | -- try this as well wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME); + wxPD_REMAINING_TIME | + wxPD_SMOOTH); bool cont = true; - for ( int i = 0; i <= max; i++ ) + bool skip = false; + // each skip will move progress about quarter forward + for ( int i = 0; i <= max; i = wxMin(i+(skip?int(max/4):1), max+1), skip = false ) { + #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); + #endif + + wxString msg; + if ( i == max ) { - cont = dialog.Update(i, _T("That's all, folks!")); + msg = _T("That's all, folks!"); } - else if ( i == max / 2 ) + else if ( i > max / 2 ) { - cont = dialog.Update(i, _T("Only a half left (very long message)!")); + msg = _T("Only a half left (very long message)!"); } - else + +#if wxUSE_STOPWATCH && wxUSE_LONGLONG + if ( (i % (max/100)) == 0 ) // // only 100 updates, this makes it much faster { - cont = dialog.Update(i); + cont = dialog.Update(i, msg, &skip); } +#else + cont = dialog.Update(i, msg, &skip); +#endif if ( !cont ) { @@ -970,6 +1057,7 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) wxYES_NO | wxICON_QUESTION) == wxYES ) break; + cont = true; dialog.Resume(); } }