X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49b957be80cf3ba9c8b9aa35678d733296e2f2c9..6e724836cbab943577776e7da03a3157b31fa5c1:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 35a477e829..96d05b980d 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -25,6 +25,10 @@ #include "wx/wx.h" #endif +#ifdef __WXWINCE__ +#include "wx/msw/wince/time.h" +#endif + #include "wx/colordlg.h" #include "wx/filedlg.h" #include "wx/dirdlg.h" @@ -44,7 +48,7 @@ #define wxUSE_DIRDLGG 0 -#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG +#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG #include "wx/generic/dirdlgg.h" #endif @@ -71,6 +75,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_FILES_OPEN, MyFrame::FilesOpen) EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave) EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose) + EVT_MENU(DIALOGS_DIRNEW_CHOOSE, MyFrame::DirChooseNew) #if defined(__WXMSW__) || defined(__WXMAC__) EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE, MyFrame::GenericDirChoose) #endif // wxMSW || wxMAC @@ -122,64 +127,69 @@ bool MyApp::OnInit() wxConvCurrent = &wxConvLibc; #endif - m_canvasTextColour = wxColour("BLACK"); + m_canvasTextColour = wxColour(_T("BLACK")); m_canvasFont = *wxNORMAL_FONT; // Create the main frame window - MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(20, 20), wxSize(400, 300)); + MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWindows dialogs example"), wxPoint(20, 20), wxSize(400, 300)); // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour"); + file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour")); #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW - file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)"); + file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("Choose colour (&generic)")); #endif file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font"); + file_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font")); #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW - file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)"); - + file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose f&ont (generic)")); #endif + file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_LOG_DIALOG, "&Log dialog\tCtrl-L"); - file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box\tCtrl-M"); - file_menu->Append(DIALOGS_TEXT_ENTRY, "Text &entry\tCtrl-E"); - file_menu->Append(DIALOGS_PASSWORD_ENTRY, "&Password entry\tCtrl-P"); - file_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N"); - file_menu->Append(DIALOGS_SINGLE_CHOICE, "&Single choice\tCtrl-C"); - file_menu->Append(DIALOGS_MULTI_CHOICE, "M&ultiple choice\tCtrl-U"); + file_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); + file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); + file_menu->Append(DIALOGS_TEXT_ENTRY, _T("Text &entry\tCtrl-E")); + file_menu->Append(DIALOGS_PASSWORD_ENTRY, _T("&Password entry\tCtrl-P")); + file_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N")); + file_menu->Append(DIALOGS_SINGLE_CHOICE, _T("&Single choice\tCtrl-C")); + file_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_TIP, "&Tip of the day\tCtrl-T"); + file_menu->Append(DIALOGS_TIP, _T("&Tip of the day\tCtrl-T")); file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_FILE_OPEN, "&Open file\tCtrl-O"); - file_menu->Append(DIALOGS_FILE_OPEN2, "&Second open file\tCtrl-2"); - file_menu->Append(DIALOGS_FILES_OPEN, "Open &files\tCtrl-Q"); - file_menu->Append(DIALOGS_FILE_SAVE, "Sa&ve file\tCtrl-S"); - file_menu->Append(DIALOGS_DIR_CHOOSE, "&Choose a directory\tCtrl-D"); + file_menu->Append(DIALOGS_FILE_OPEN, _T("&Open file\tCtrl-O")); + file_menu->Append(DIALOGS_FILE_OPEN2, _T("&Second open file\tCtrl-2")); + file_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); + file_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); + file_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); + file_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); #if defined(__WXMSW__) || defined(__WXMAC__) - file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, "&Choose a directory (generic implementation)"); + file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic implementation)")); #endif // wxMSW || wxMAC + file_menu->AppendSeparator(); + #if wxUSE_PROGRESSDLG - file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G"); + file_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G")); #endif // wxUSE_PROGRESSDLG #if wxUSE_BUSYINFO - file_menu->Append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B"); + file_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B")); #endif // wxUSE_BUSYINFO #if wxUSE_FINDREPLDLG - file_menu->Append(DIALOGS_FIND, "&Find dialog\tCtrl-F", "", TRUE); - file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", TRUE); + file_menu->Append(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"), _T(""), TRUE); + file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), _T(""), TRUE); #endif // wxUSE_FINDREPLDLG file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-W"); - file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE); + + file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); + file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), _T(""), TRUE); file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT, "E&xit\tAlt-X"); + + file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, _T("&File")); frame->SetMenuBar(menu_bar); myCanvas = new MyCanvas(frame); @@ -226,32 +236,38 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) } wxColourDialog dialog(this, &data); - dialog.SetTitle("Choose the background colour"); + dialog.SetTitle(_T("Choose the background colour")); if (dialog.ShowModal() == wxID_OK) { wxColourData retData = dialog.GetColourData(); col = retData.GetColour(); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } } void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) { - wxFontData data; - data.SetInitialFont(wxGetApp().m_canvasFont); - data.SetColour(wxGetApp().m_canvasTextColour); + wxFontData data; + data.SetInitialFont(wxGetApp().m_canvasFont); + data.SetColour(wxGetApp().m_canvasTextColour); - wxFontDialog *dialog = new wxFontDialog(this, &data); - if (dialog->ShowModal() == wxID_OK) - { - wxFontData retData = dialog->GetFontData(); + // you might also do this: + // + // wxFontDialog dialog; + // if ( !dialog.Create(this, data) { ... error ... } + // + wxFontDialog dialog(this, data); + + if (dialog.ShowModal() == wxID_OK) + { + wxFontData retData = dialog.GetFontData(); wxGetApp().m_canvasFont = retData.GetChosenFont(); wxGetApp().m_canvasTextColour = retData.GetColour(); myCanvas->Refresh(); - } - dialog->Destroy(); + } + //else: cancelled by the user, don't change the font } #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW @@ -272,7 +288,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) wxColour col = retData.GetColour(); // wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } dialog->Destroy(); @@ -296,7 +312,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) } #endif // wxTEST_GENERIC_DIALOGS_IN_MSW -void MyFrame::LogDialog(wxCommandEvent& event) +void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event)) { // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages // being flushed -- test it @@ -320,40 +336,40 @@ void MyFrame::LogDialog(wxCommandEvent& event) void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) { - wxMessageDialog dialog( NULL, "This is a message box\nA long, long string to test out the message box properly", - "Message box text", wxNO_DEFAULT|wxYES_NO|wxCANCEL|wxICON_INFORMATION); + wxMessageDialog dialog( NULL, _T("This is a message box\nA long, long string to test out the message box properly"), + _T("Message box text"), wxNO_DEFAULT|wxYES_NO|wxCANCEL|wxICON_INFORMATION); switch ( dialog.ShowModal() ) { case wxID_YES: - wxLogStatus("You pressed \"Yes\""); + wxLogStatus(wxT("You pressed \"Yes\"")); break; case wxID_NO: - wxLogStatus("You pressed \"No\""); + wxLogStatus(wxT("You pressed \"No\"")); break; case wxID_CANCEL: - wxLogStatus("You pressed \"Cancel\""); + wxLogStatus(wxT("You pressed \"Cancel\"")); break; default: - wxLogError("Unexpected wxMessageDialog return code!"); + wxLogError(wxT("Unexpected wxMessageDialog return code!")); } } void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) ) { - long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n" - "Even two rows of text.", - "Enter a number:", "Numeric input test", + long res = wxGetNumberFromUser( _T("This is some text, actually a lot of text.\n") + _T("Even two rows of text."), + _T("Enter a number:"), _T("Numeric input test"), 50, 0, 100, this ); wxString msg; int icon; if ( res == -1 ) { - msg = "Invalid number entered or dialog cancelled."; + msg = _T("Invalid number entered or dialog cancelled."); icon = wxICON_HAND; } else @@ -362,53 +378,53 @@ void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) ) icon = wxICON_INFORMATION; } - wxMessageBox(msg, "Numeric test result", wxOK | icon, this); + wxMessageBox(msg, _T("Numeric test result"), wxOK | icon, this); } void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event)) { - wxString pwd = wxGetPasswordFromUser("Enter password:", - "Password entry dialog", - "", + wxString pwd = wxGetPasswordFromUser(_T("Enter password:"), + _T("Password entry dialog"), + _T(""), this); if ( !!pwd ) { wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()), - "Got password", wxOK | wxICON_INFORMATION, this); + _T("Got password"), wxOK | wxICON_INFORMATION, this); } } void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event)) { wxTextEntryDialog dialog(this, - "This is a small sample\n" - "A long, long string to test out the text entrybox", - "Please enter a string", - "Default value", + _T("This is a small sample\n") + _T("A long, long string to test out the text entrybox"), + _T("Please enter a string"), + _T("Default value"), wxOK | wxCANCEL); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetValue(), "Got string"); + wxMessageDialog dialog2(this, dialog.GetValue(), _T("Got string")); dialog2.ShowModal(); } } void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) ) { - const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ; + const wxString choices[] = { _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five") } ; wxSingleChoiceDialog dialog(this, - "This is a small sample\n" - "A single-choice convenience dialog", - "Please select a value", + _T("This is a small sample\n") + _T("A single-choice convenience dialog"), + _T("Please select a value"), WXSIZEOF(choices), choices); dialog.SetSelection(2); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetStringSelection(), "Got string"); + wxMessageDialog dialog2(this, dialog.GetStringSelection(), _T("Got string")); dialog2.ShowModal(); } } @@ -417,25 +433,26 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) { const wxString choices[] = { - "One", "Two", "Three", "Four", "Five", - "Six", "Seven", "Eight", "Nine", "Ten", - "Eleven", "Twelve", "Seventeen", + _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five"), + _T("Six"), _T("Seven"), _T("Eight"), _T("Nine"), _T("Ten"), + _T("Eleven"), _T("Twelve"), _T("Seventeen"), }; wxArrayInt selections; size_t count = wxGetMultipleChoices(selections, - "This is a small sample\n" - "A multi-choice convenience dialog", - "Please select a value", + _T("This is a small sample\n") + _T("A multi-choice convenience dialog"), + _T("Please select a value"), WXSIZEOF(choices), choices, this); if ( count ) { wxString msg; - msg.Printf(wxT("You selected %u items:\n"), count); + msg.Printf(wxT("You selected %u items:\n"), (unsigned)count); for ( size_t n = 0; n < count; n++ ) { - msg += wxString::Format(wxT("\t%u: %u (%s)\n"), n, selections[n], + msg += wxString::Format(wxT("\t%u: %u (%s)\n"), + (unsigned)n, (unsigned)selections[n], choices[selections[n]].c_str()); } wxLogMessage(msg); @@ -451,9 +468,15 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) _T("Testing open file dialog"), _T(""), _T(""), +#ifdef __WXMOTIF__ + _T("C++ files (*.cpp)|*.cpp") +#else _T("C++ files (*.h;*.cpp)|*.h;*.cpp") +#endif ); + dialog.SetDirectory(wxGetHomeDir()); + if (dialog.ShowModal() == wxID_OK) { wxString info; @@ -463,7 +486,7 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) dialog.GetPath().c_str(), dialog.GetDirectory().c_str(), dialog.GetFilename().c_str()); - wxMessageDialog dialog2(this, info, "Selected file"); + wxMessageDialog dialog2(this, info, _T("Selected file")); dialog2.ShowModal(); } } @@ -495,8 +518,14 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) ) void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) { - wxFileDialog dialog(this, "Testing open multiple file dialog", - "", "", wxFileSelectorDefaultWildcardStr, + wxString wildcards = +#ifdef __WXMOTIF__ + _T("C++ files (*.cpp)|*.cpp"); +#else + _T("All files (*.*)|*.*|C++ files (*.h;*.cpp)|*.h;*.cpp"); +#endif + wxFileDialog dialog(this, _T("Testing open multiple file dialog"), + _T(""), _T(""), wildcards, wxMULTIPLE); if (dialog.ShowModal() == wxID_OK) @@ -511,60 +540,74 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) for ( size_t n = 0; n < count; n++ ) { s.Printf(_T("File %d: %s (%s)\n"), - n, paths[n].c_str(), filenames[n].c_str()); + (int)n, paths[n].c_str(), filenames[n].c_str()); msg += s; } + s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex()); + msg += s; - wxMessageDialog dialog2(this, msg, "Selected files"); + wxMessageDialog dialog2(this, msg, _T("Selected files")); dialog2.ShowModal(); } } void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) ) { - wxFileDialog dialog(this, "Testing save file dialog", "", "myletter.txt", - "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc", - wxSAVE|wxOVERWRITE_PROMPT); + wxFileDialog dialog(this, + _T("Testing save file dialog"), + _T(""), + _T("myletter.doc"), + _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"), + wxSAVE|wxOVERWRITE_PROMPT); + + dialog.SetFilterIndex(1); if (dialog.ShowModal() == wxID_OK) { - wxChar buf[400]; - wxSprintf(buf, _T("%s, filter %d"), (const wxChar*)dialog.GetPath(), dialog.GetFilterIndex()); - wxMessageDialog dialog2(this, wxString(buf), "Selected path"); - dialog2.ShowModal(); + wxLogMessage(_T("%s, filter %d"), + dialog.GetPath().c_str(), dialog.GetFilterIndex()); } } -void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::DoDirChoose(int style) { // pass some initial dir to wxDirDialog wxString dirHome; wxGetHomeDir(&dirHome); - wxDirDialog dialog(this, "Testing directory picker", dirHome); + wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path"); - dialog2.ShowModal(); + wxLogMessage(_T("Selected path: %s"), dialog.GetPath().c_str()); } } +void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) +{ + DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_NEW_DIR_BUTTON); +} + +void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) ) +{ + DoDirChoose(wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON); +} + #if defined(__WXMSW__) || defined(__WXMAC__) void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) { -#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG +#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG // pass some initial dir to wxDirDialog wxString dirHome; wxGetHomeDir(&dirHome); - wxGenericDirDialog dialog(this, "Testing generic directory picker", dirHome); + wxGenericDirDialog dialog(this, _T("Testing generic directory picker"), dirHome); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path"); + wxMessageDialog dialog2(this, dialog.GetPath(), _T("Selected path")); dialog2.ShowModal(); } #else @@ -600,7 +643,7 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } } -void MyFrame::ShowTip(wxCommandEvent& event) +void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_STARTUP_TIPS static size_t s_index = (size_t)-1; @@ -614,13 +657,13 @@ void MyFrame::ShowTip(wxCommandEvent& event) s_index = rand() % 5; } - wxTipProvider *tipProvider = wxCreateFileTipProvider("tips.txt", s_index); + wxTipProvider *tipProvider = wxCreateFileTipProvider(_T("tips.txt"), s_index); bool showAtStartup = wxShowTip(this, tipProvider); if ( showAtStartup ) { - wxMessageBox("Will show tips on startup", "Tips dialog", + wxMessageBox(_T("Will show tips on startup"), _T("Tips dialog"), wxOK | wxICON_INFORMATION, this); } @@ -640,32 +683,43 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) { static const int max = 10; - wxProgressDialog dialog("Progress dialog example", - "An informative message", + wxProgressDialog dialog(_T("Progress dialog example"), + _T("An informative message"), max, // range this, // parent wxPD_CAN_ABORT | wxPD_APP_MODAL | + // wxPD_AUTO_HIDE | -- try this as well wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME); bool cont = TRUE; - for ( int i = 0; i <= max && cont; i++ ) + for ( int i = 0; i <= max; i++ ) { wxSleep(1); if ( i == max ) { - cont = dialog.Update(i, "That's all, folks!"); + cont = dialog.Update(i, _T("That's all, folks!")); } else if ( i == max / 2 ) { - cont = dialog.Update(i, "Only a half left (very long message)!"); + cont = dialog.Update(i, _T("Only a half left (very long message)!")); } else { cont = dialog.Update(i); } + + if ( !cont ) + { + if ( wxMessageBox(_T("Do you really want to cancel?"), + _T("Progress dialog question"), // caption + wxYES_NO | wxICON_QUESTION) == wxYES ) + break; + + dialog.Resume(); + } } if ( !cont ) @@ -686,13 +740,16 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event)) { wxWindowDisabler disableAll; - wxBusyInfo info("Working, please wait...", this); + wxBusyInfo info(_T("Working, please wait..."), this); - for ( int i = 0; i < 30; i++ ) + for ( int i = 0; i < 18; i++ ) { - wxUsleep(100); + //wxUsleep(100); wxTheApp->Yield(); } + + wxSleep(2); + //wxWakeUpIdle(); } #endif // wxUSE_BUSYINFO @@ -712,7 +769,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) ) ( this, &m_findData, - "Find and replace dialog", + _T("Find and replace dialog"), wxFR_REPLACEDIALOG ); @@ -733,7 +790,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) ( this, &m_findData, - "Find dialog", + _T("Find dialog"), // just for testing wxFR_NOWHOLEWORD ); @@ -745,10 +802,10 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) static wxString DecodeFindDialogEventFlags(int flags) { wxString str; - str << (flags & wxFR_DOWN ? "down" : "up") << ", " - << (flags & wxFR_WHOLEWORD ? "whole words only, " : "") - << (flags & wxFR_MATCHCASE ? "" : "not ") - << "case sensitive"; + str << (flags & wxFR_DOWN ? _T("down") : _T("up")) << _T(", ") + << (flags & wxFR_WHOLEWORD ? _T("whole words only, ") : _T("")) + << (flags & wxFR_MATCHCASE ? _T("") : _T("not ")) + << _T("case sensitive"); return str; } @@ -760,7 +817,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) if ( type == wxEVT_COMMAND_FIND || type == wxEVT_COMMAND_FIND_NEXT ) { wxLogMessage(wxT("Find %s'%s' (flags: %s)"), - type == wxEVT_COMMAND_FIND_NEXT ? "next " : "", + type == wxEVT_COMMAND_FIND_NEXT ? wxT("next ") : wxT(""), event.GetFindString().c_str(), DecodeFindDialogEventFlags(event.GetFlags()).c_str()); } @@ -768,7 +825,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) type == wxEVT_COMMAND_FIND_REPLACE_ALL ) { wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"), - type == wxEVT_COMMAND_FIND_REPLACE_ALL ? "all " : "", + type == wxEVT_COMMAND_FIND_REPLACE_ALL ? _T("all ") : wxT(""), event.GetFindString().c_str(), event.GetReplaceString().c_str(), DecodeFindDialogEventFlags(event.GetFlags()).c_str()); @@ -777,25 +834,34 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) { wxFindReplaceDialog *dlg = event.GetDialog(); + int idMenu; const wxChar *txt; if ( dlg == m_dlgFind ) { txt = _T("Find"); + idMenu = DIALOGS_FIND; m_dlgFind = NULL; } else if ( dlg == m_dlgReplace ) { txt = _T("Replace"); + idMenu = DIALOGS_REPLACE; m_dlgReplace = NULL; } else { txt = _T("Unknown"); + idMenu = -1; - wxFAIL_MSG( _T("unexecpted event") ); + wxFAIL_MSG( _T("unexpected event") ); } - wxLogMessage(wxT("%s dialog is being closed."), txt), + wxLogMessage(wxT("%s dialog is being closed."), txt); + + if ( idMenu != -1 ) + { + GetMenuBar()->Check(idMenu, FALSE); + } dlg->Destroy(); } @@ -817,7 +883,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) ) dc.SetFont(wxGetApp().m_canvasFont); dc.SetTextForeground(wxGetApp().m_canvasTextColour); dc.SetBackgroundMode(wxTRANSPARENT); - dc.DrawText("wxWindows common dialogs test application", 10, 10); + dc.DrawText(_T("wxWindows common dialogs test application"), 10, 10); } // ---------------------------------------------------------------------------- @@ -825,12 +891,12 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) ) // ---------------------------------------------------------------------------- MyModelessDialog::MyModelessDialog(wxWindow *parent) - : wxDialog(parent, -1, wxString("Modeless dialog")) + : wxDialog(parent, -1, wxString(_T("Modeless dialog"))) { wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, "Press me"); - wxCheckBox *check = new wxCheckBox(this, -1, "Should be disabled"); + wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, _T("Press me")); + wxCheckBox *check = new wxCheckBox(this, -1, _T("Should be disabled")); check->Disable(); sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5); @@ -845,7 +911,7 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent) void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox("Button pressed in modeless dialog", "Info", + wxMessageBox(_T("Button pressed in modeless dialog"), _T("Info"), wxOK | wxICON_INFORMATION, this); } @@ -853,8 +919,8 @@ void MyModelessDialog::OnClose(wxCloseEvent& event) { if ( event.CanVeto() ) { - wxMessageBox("Use the menu item to close this dialog", - "Modeless dialog", + wxMessageBox(_T("Use the menu item to close this dialog"), + _T("Modeless dialog"), wxOK | wxICON_INFORMATION, this); event.Veto(); @@ -866,14 +932,17 @@ void MyModelessDialog::OnClose(wxCloseEvent& event) // ---------------------------------------------------------------------------- MyModalDialog::MyModalDialog(wxWindow *parent) - : wxDialog(parent, -1, wxString("Modal dialog")) + : wxDialog(parent, -1, wxString(_T("Modal dialog"))) { wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); - m_btnFocused = new wxButton(this, -1, "Default button"); - m_btnDelete = new wxButton(this, -1, "&Delete button"); - wxButton *btnOk = new wxButton(this, wxID_CANCEL, "&Close"); - sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5); + m_btnModal = new wxButton(this, -1, _T("&Modal dialog...")); + m_btnModeless = new wxButton(this, -1, _T("Mode&less dialog")); + m_btnDelete = new wxButton(this, -1, _T("&Delete button")); + + wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close")); + sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5); + sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5); @@ -883,23 +952,28 @@ MyModalDialog::MyModalDialog(wxWindow *parent) sizerTop->SetSizeHints(this); sizerTop->Fit(this); - m_btnFocused->SetFocus(); - m_btnFocused->SetDefault(); + m_btnModal->SetFocus(); + m_btnModal->SetDefault(); } void MyModalDialog::OnButton(wxCommandEvent& event) { if ( event.GetEventObject() == m_btnDelete ) { - delete m_btnFocused; - m_btnFocused = NULL; + delete m_btnModal; + m_btnModal = NULL; m_btnDelete->Disable(); } - else if ( event.GetEventObject() == m_btnFocused ) + else if ( event.GetEventObject() == m_btnModal ) + { + wxGetTextFromUser(_T("Dummy prompt"), + _T("Modal dialog called from dialog"), + _T(""), this); + } + else if ( event.GetEventObject() == m_btnModeless ) { - wxGetTextFromUser("Dummy prompt", "Modal dialog called from dialog", - "", this); + (new MyModelessDialog(this))->Show(); } else {