X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d49ce4485af0c6ee498193519473cd8a830bbff..b231914f6abe2c148193b006a0919d60575f9a20:/samples/dialogs/dialogs.cpp?ds=sidebyside diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index f2d8a6ead2..1420859da4 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -32,9 +32,7 @@ #include "wx/choicdlg.h" #include "wx/tipdlg.h" #include "wx/progdlg.h" - -// New wxGenericDirCtrl -#include "wx/dirctrl.h" +#include "wx/fdrepdlg.h" #define wxTEST_GENERIC_DIALOGS_IN_MSW 0 @@ -43,6 +41,11 @@ #include #endif +#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG +// New wxGenericDirCtrl +#include "wx/dirctrl.h" +#endif + #include "dialogs.h" IMPLEMENT_APP(MyApp) @@ -76,10 +79,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif #if wxUSE_PROGRESSDLG EVT_MENU(DIALOGS_PROGRESS, MyFrame::ShowProgress) -#endif +#endif // wxUSE_PROGRESSDLG +#if wxUSE_FINDREPLDLG + EVT_MENU(DIALOGS_FIND, MyFrame::ShowFindDialog) + EVT_MENU(DIALOGS_REPLACE, MyFrame::ShowReplaceDialog) + + EVT_FIND(-1, MyFrame::OnFindDialog) + EVT_FIND_NEXT(-1, MyFrame::OnFindDialog) + EVT_FIND_REPLACE(-1, MyFrame::OnFindDialog) + EVT_FIND_REPLACE_ALL(-1, MyFrame::OnFindDialog) + EVT_FIND_CLOSE(-1, MyFrame::OnFindDialog) +#endif // wxUSE_FINDREPLDLG EVT_MENU(wxID_EXIT, MyFrame::OnExit) - - EVT_BUTTON(DIALOGS_MODELESS_BTN, MyFrame::OnButton) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyModalDialog, wxDialog) @@ -87,6 +98,8 @@ BEGIN_EVENT_TABLE(MyModalDialog, wxDialog) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog) + EVT_BUTTON(DIALOGS_MODELESS_BTN, MyModelessDialog::OnButton) + EVT_CLOSE(MyModelessDialog::OnClose) END_EVENT_TABLE() @@ -141,8 +154,12 @@ bool MyApp::OnInit() #if wxUSE_PROGRESSDLG file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G"); #endif // wxUSE_PROGRESSDLG +#if wxUSE_FINDREPLDLG + file_menu->Append(DIALOGS_FIND, "&Find dialog\tCtrl-F"); + file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F"); +#endif // wxUSE_FINDREPLDLG file_menu->AppendSeparator(); - file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-F"); + file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-D"); file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE); file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, "E&xit\tAlt-X"); @@ -261,17 +278,20 @@ void MyFrame::LogDialog(wxCommandEvent& event) // being flushed -- test it { wxBusyCursor bc; - wxLogMessage("This is some message - everything is ok so far."); - wxLogMessage("Another message...\n... this one is on multiple lines"); - wxLogWarning("And then something went wrong!"); + wxLogMessage(wxT("This is some message - everything is ok so far.")); + wxLogMessage(wxT("Another message...\n... this one is on multiple lines")); + wxLogWarning(wxT("And then something went wrong!")); + + // and if ~wxBusyCursor doesn't do it, then call it manually + wxYield(); } - wxLogError("Intermediary error handler decided to abort."); - wxLogError("The top level caller detected an unrecoverable error."); + wxLogError(wxT("Intermediary error handler decided to abort.")); + wxLogError(wxT("The top level caller detected an unrecoverable error.")); wxLog::FlushActive(); - wxLogMessage("And this is the same dialog but with only one message."); + wxLogMessage(wxT("And this is the same dialog but with only one message.")); } void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) @@ -313,7 +333,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event)) this); if ( !!pwd ) { - wxMessageBox(wxString::Format("Your password is '%s'", pwd.c_str()), + wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()), "Got password", wxOK | wxICON_INFORMATION, this); } } @@ -366,10 +386,10 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) if ( count ) { wxString msg; - msg.Printf("You selected %u items:\n", count); + msg.Printf(wxT("You selected %u items:\n"), count); for ( size_t n = 0; n < count; n++ ) { - msg += wxString::Format("\t%u: %u (%s)\n", n, selections[n], + msg += wxString::Format(wxT("\t%u: %u (%s)\n"), n, selections[n], choices[selections[n]].c_str()); } wxLogMessage(msg); @@ -379,6 +399,8 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) { +// wxFAIL_MSG( "Test assert" ); + wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0); if (dialog.ShowModal() == wxID_OK) @@ -480,6 +502,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) { +#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG // pass some initial dir to wxDirDialog wxString dirHome; wxGetHomeDir(&dirHome); @@ -491,6 +514,10 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path"); dialog2.ShowModal(); } +#else + wxLogError(wxT("Sorry, generic dir dialog not available:\n") + wxT("set wxUSE_DIRDLGG to 1 and recompile")); +#endif } void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event)) @@ -518,12 +545,6 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } } -void MyFrame::OnButton(wxCommandEvent& WXUNUSED(event)) -{ - wxMessageBox("Button pressed in modeless dialog", "Info", - wxOK | wxICON_INFORMATION, this); -} - void MyFrame::ShowTip(wxCommandEvent& event) { #if wxUSE_STARTUP_TIPS @@ -594,16 +615,88 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) if ( !cont ) { - wxLogStatus("Progress dialog aborted!"); + wxLogStatus(wxT("Progress dialog aborted!")); } else { - wxLogStatus("Countdown from %d finished", max); + wxLogStatus(wxT("Countdown from %d finished"), max); } } #endif // wxUSE_PROGRESSDLG +#if wxUSE_FINDREPLDLG + +void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) ) +{ + wxFindReplaceDialog *dialog = new wxFindReplaceDialog + ( + this, + &m_findData, + "Find and replace dialog", + wxFR_REPLACEDIALOG + ); + dialog->Show(TRUE); +} + +void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) +{ + wxFindReplaceDialog *dialog = new wxFindReplaceDialog + ( + this, + &m_findData, + "Find dialog", + // just for testing + wxFR_NOWHOLEWORD + ); + dialog->Show(TRUE); +} + +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"; + + return str; +} + +void MyFrame::OnFindDialog(wxFindDialogEvent& event) +{ + wxEventType type = event.GetEventType(); + + if ( type == wxEVT_COMMAND_FIND || type == wxEVT_COMMAND_FIND_NEXT ) + { + wxLogMessage(wxT("Find %s'%s' (flags: %s)"), + type == wxEVT_COMMAND_FIND_NEXT ? "next " : "", + event.GetFindString().c_str(), + DecodeFindDialogEventFlags(event.GetFlags()).c_str()); + } + else if ( type == wxEVT_COMMAND_FIND_REPLACE || + type == wxEVT_COMMAND_FIND_REPLACE_ALL ) + { + wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"), + type == wxEVT_COMMAND_FIND_REPLACE_ALL ? "all " : "", + event.GetFindString().c_str(), + event.GetReplaceString().c_str(), + DecodeFindDialogEventFlags(event.GetFlags()).c_str()); + } + else if ( type == wxEVT_COMMAND_FIND_CLOSE ) + { + wxLogMessage(wxT("Find dialog is being closed.")); + + event.GetDialog()->Destroy(); + } + else + { + wxLogError(wxT("Unknown find dialog event!")); + } +} + +#endif // wxUSE_FINDREPLDLG + // ---------------------------------------------------------------------------- // MyCanvas // ---------------------------------------------------------------------------- @@ -640,6 +733,12 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent) sizerTop->Fit(this); } +void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event)) +{ + wxMessageBox("Button pressed in modeless dialog", "Info", + wxOK | wxICON_INFORMATION, this); +} + void MyModelessDialog::OnClose(wxCloseEvent& event) { if ( event.CanVeto() )