X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43b2d5e7c3b3e3d6b245e279dde73d96e0075911..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/exec/exec.cpp diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index a979d505ab..ab63144a8e 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -209,7 +209,7 @@ protected: void DoSend() { wxString s(m_textOut->GetValue()); - s += _T('\n'); + s += wxT('\n'); m_out.Write(s.c_str(), s.length()); m_textOut->Clear(); @@ -331,7 +331,7 @@ enum Exec_Btn_Close }; -static const wxChar *DIALOG_TITLE = _T("Exec sample"); +static const wxChar *DIALOG_TITLE = wxT("Exec sample"); // ---------------------------------------------------------------------------- // event tables and other macros for wxWidgets @@ -408,7 +408,7 @@ bool MyApp::OnInit() return false; // Create the main application window - MyFrame *frame = new MyFrame(_T("Exec wxWidgets sample"), + MyFrame *frame = new MyFrame(wxT("Exec wxWidgets sample"), wxDefaultPosition, wxSize(500, 140)); // Show it and tell the application that it's our main window @@ -445,55 +445,55 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // create a menu bar wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF); - menuFile->Append(Exec_Kill, _T("&Kill process...\tCtrl-K"), - _T("Kill a process by PID")); + menuFile->Append(Exec_Kill, wxT("&Kill process...\tCtrl-K"), + wxT("Kill a process by PID")); menuFile->AppendSeparator(); - menuFile->Append(Exec_ClearLog, _T("&Clear log\tCtrl-L"), - _T("Clear the log window")); + menuFile->Append(Exec_ClearLog, wxT("&Clear log\tCtrl-L"), + wxT("Clear the log window")); menuFile->AppendSeparator(); - menuFile->Append(Exec_BeginBusyCursor, _T("Show &busy cursor\tCtrl-C")); - menuFile->Append(Exec_EndBusyCursor, _T("Show &normal cursor\tShift-Ctrl-C")); + menuFile->Append(Exec_BeginBusyCursor, wxT("Show &busy cursor\tCtrl-C")); + menuFile->Append(Exec_EndBusyCursor, wxT("Show &normal cursor\tShift-Ctrl-C")); menuFile->AppendSeparator(); - menuFile->Append(Exec_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + menuFile->Append(Exec_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); wxMenu *execMenu = new wxMenu; - execMenu->Append(Exec_SyncExec, _T("Sync &execution...\tCtrl-E"), - _T("Launch a program and return when it terminates")); - execMenu->Append(Exec_SyncNoEventsExec, _T("Sync execution and &block...\tCtrl-B"), - _T("Launch a program and block until it terminates")); - execMenu->Append(Exec_AsyncExec, _T("&Async execution...\tCtrl-A"), - _T("Launch a program and return immediately")); - execMenu->Append(Exec_Shell, _T("Execute &shell command...\tCtrl-S"), - _T("Launch a shell and execute a command in it")); + execMenu->Append(Exec_SyncExec, wxT("Sync &execution...\tCtrl-E"), + wxT("Launch a program and return when it terminates")); + execMenu->Append(Exec_SyncNoEventsExec, wxT("Sync execution and &block...\tCtrl-B"), + wxT("Launch a program and block until it terminates")); + execMenu->Append(Exec_AsyncExec, wxT("&Async execution...\tCtrl-A"), + wxT("Launch a program and return immediately")); + execMenu->Append(Exec_Shell, wxT("Execute &shell command...\tCtrl-S"), + wxT("Launch a shell and execute a command in it")); execMenu->AppendSeparator(); - execMenu->Append(Exec_Redirect, _T("Capture command &output...\tCtrl-O"), - _T("Launch a program and capture its output")); - execMenu->Append(Exec_Pipe, _T("&Pipe through command..."), - _T("Pipe a string through a filter")); - execMenu->Append(Exec_POpen, _T("&Open a pipe to a command...\tCtrl-P"), - _T("Open a pipe to and from another program")); + execMenu->Append(Exec_Redirect, wxT("Capture command &output...\tCtrl-O"), + wxT("Launch a program and capture its output")); + execMenu->Append(Exec_Pipe, wxT("&Pipe through command..."), + wxT("Pipe a string through a filter")); + execMenu->Append(Exec_POpen, wxT("&Open a pipe to a command...\tCtrl-P"), + wxT("Open a pipe to and from another program")); execMenu->AppendSeparator(); - execMenu->Append(Exec_OpenFile, _T("Open &file...\tCtrl-F"), - _T("Launch the command to open this kind of files")); - execMenu->Append(Exec_LaunchFile, _T("La&unch file...\tShift-Ctrl-F"), - _T("Launch the default application associated with the file")); - execMenu->Append(Exec_OpenURL, _T("Open &URL...\tCtrl-U"), - _T("Launch the default browser with the given URL")); + execMenu->Append(Exec_OpenFile, wxT("Open &file...\tCtrl-F"), + wxT("Launch the command to open this kind of files")); + execMenu->Append(Exec_LaunchFile, wxT("La&unch file...\tShift-Ctrl-F"), + wxT("Launch the default application associated with the file")); + execMenu->Append(Exec_OpenURL, wxT("Open &URL...\tCtrl-U"), + wxT("Launch the default browser with the given URL")); #ifdef __WINDOWS__ execMenu->AppendSeparator(); - execMenu->Append(Exec_DDEExec, _T("Execute command via &DDE...\tCtrl-D")); - execMenu->Append(Exec_DDERequest, _T("Send DDE &request...\tCtrl-R")); + execMenu->Append(Exec_DDEExec, wxT("Execute command via &DDE...\tCtrl-D")); + execMenu->Append(Exec_DDERequest, wxT("Send DDE &request...\tCtrl-R")); #endif wxMenu *helpMenu = new wxMenu(wxEmptyString, wxMENU_TEAROFF); - helpMenu->Append(Exec_About, _T("&About...\tF1"), _T("Show about dialog")); + helpMenu->Append(Exec_About, wxT("&About...\tF1"), wxT("Show about dialog")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(menuFile, _T("&File")); - menuBar->Append(execMenu, _T("&Exec")); - menuBar->Append(helpMenu, _T("&Help")); + menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(execMenu, wxT("&Exec")); + menuBar->Append(helpMenu, wxT("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -508,7 +508,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWidgets exec sample!")); + SetStatusText(wxT("Welcome to wxWidgets exec sample!")); #endif // wxUSE_STATUSBAR m_timerBg.Start(1000); @@ -552,15 +552,15 @@ void MyFrame::OnEndBusyCursor(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Exec wxWidgets Sample\n(c) 2000-2002 Vadim Zeitlin"), - _T("About Exec"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(wxT("Exec wxWidgets Sample\n(c) 2000-2002 Vadim Zeitlin"), + wxT("About Exec"), wxOK | wxICON_INFORMATION, this); } void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event)) { - long pid = wxGetNumberFromUser(_T("Please specify the process to kill"), - _T("Enter PID:"), - _T("Exec question"), + long pid = wxGetNumberFromUser(wxT("Please specify the process to kill"), + wxT("Enter PID:"), + wxT("Exec question"), m_pidLast, // we need the full unsigned int range -INT_MAX, INT_MAX, @@ -573,32 +573,32 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event)) static const wxString signalNames[] = { - _T("Just test (SIGNONE)"), - _T("Hangup (SIGHUP)"), - _T("Interrupt (SIGINT)"), - _T("Quit (SIGQUIT)"), - _T("Illegal instruction (SIGILL)"), - _T("Trap (SIGTRAP)"), - _T("Abort (SIGABRT)"), - _T("Emulated trap (SIGEMT)"), - _T("FP exception (SIGFPE)"), - _T("Kill (SIGKILL)"), - _T("Bus (SIGBUS)"), - _T("Segment violation (SIGSEGV)"), - _T("System (SIGSYS)"), - _T("Broken pipe (SIGPIPE)"), - _T("Alarm (SIGALRM)"), - _T("Terminate (SIGTERM)"), + wxT("Just test (SIGNONE)"), + wxT("Hangup (SIGHUP)"), + wxT("Interrupt (SIGINT)"), + wxT("Quit (SIGQUIT)"), + wxT("Illegal instruction (SIGILL)"), + wxT("Trap (SIGTRAP)"), + wxT("Abort (SIGABRT)"), + wxT("Emulated trap (SIGEMT)"), + wxT("FP exception (SIGFPE)"), + wxT("Kill (SIGKILL)"), + wxT("Bus (SIGBUS)"), + wxT("Segment violation (SIGSEGV)"), + wxT("System (SIGSYS)"), + wxT("Broken pipe (SIGPIPE)"), + wxT("Alarm (SIGALRM)"), + wxT("Terminate (SIGTERM)"), }; - int sig = wxGetSingleChoiceIndex(_T("How to kill the process?"), - _T("Exec question"), + int sig = wxGetSingleChoiceIndex(wxT("How to kill the process?"), + wxT("Exec question"), WXSIZEOF(signalNames), signalNames, this); switch ( sig ) { default: - wxFAIL_MSG( _T("unexpected return value") ); + wxFAIL_MSG( wxT("unexpected return value") ); // fall through case -1: @@ -628,11 +628,11 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event)) { if ( wxProcess::Exists(pid) ) { - wxLogStatus(_T("Process %ld is running."), pid); + wxLogStatus(wxT("Process %ld is running."), pid); } else { - wxLogStatus(_T("No process with pid = %ld."), pid); + wxLogStatus(wxT("No process with pid = %ld."), pid); } } else // not SIGNONE @@ -640,20 +640,20 @@ void MyFrame::OnKill(wxCommandEvent& WXUNUSED(event)) wxKillError rc = wxProcess::Kill(pid, (wxSignal)sig); if ( rc == wxKILL_OK ) { - wxLogStatus(_T("Process %ld killed with signal %d."), pid, sig); + wxLogStatus(wxT("Process %ld killed with signal %d."), pid, sig); } else { static const wxChar *errorText[] = { - _T(""), // no error - _T("signal not supported"), - _T("permission denied"), - _T("no such process"), - _T("unspecified error"), + wxT(""), // no error + wxT("signal not supported"), + wxT("permission denied"), + wxT("no such process"), + wxT("unspecified error"), }; - wxLogStatus(_T("Failed to kill process %ld with signal %d: %s"), + wxLogStatus(wxT("Failed to kill process %ld with signal %d: %s"), pid, sig, errorText[rc]); } } @@ -669,13 +669,13 @@ void MyFrame::DoAsyncExec(const wxString& cmd) m_pidLast = wxExecute(cmd, wxEXEC_ASYNC, process); if ( !m_pidLast ) { - wxLogError(_T("Execution of '%s' failed."), cmd.c_str()); + wxLogError(wxT("Execution of '%s' failed."), cmd.c_str()); delete process; } else { - wxLogStatus(_T("Process %ld (%s) launched."), m_pidLast, cmd.c_str()); + wxLogStatus(wxT("Process %ld (%s) launched."), m_pidLast, cmd.c_str()); m_cmdLast = cmd; @@ -687,18 +687,18 @@ void MyFrame::DoAsyncExec(const wxString& cmd) void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event)) { - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); if ( !cmd ) return; - wxLogStatus( _T("'%s' is running please wait..."), cmd.c_str() ); + wxLogStatus( wxT("'%s' is running please wait..."), cmd.c_str() ); int code = wxExecute(cmd, wxEXEC_SYNC); - wxLogStatus(_T("Process '%s' terminated with exit code %d."), + wxLogStatus(wxT("Process '%s' terminated with exit code %d."), cmd.c_str(), code); m_cmdLast = cmd; @@ -706,18 +706,18 @@ void MyFrame::OnSyncExec(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSyncNoEventsExec(wxCommandEvent& WXUNUSED(event)) { - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); if ( !cmd ) return; - wxLogStatus( _T("'%s' is running please wait..."), cmd.c_str() ); + wxLogStatus( wxT("'%s' is running please wait..."), cmd.c_str() ); int code = wxExecute(cmd, wxEXEC_BLOCK); - wxLogStatus(_T("Process '%s' terminated with exit code %d."), + wxLogStatus(wxT("Process '%s' terminated with exit code %d."), cmd.c_str(), code); m_cmdLast = cmd; @@ -725,7 +725,7 @@ void MyFrame::OnSyncNoEventsExec(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAsyncExec(wxCommandEvent& WXUNUSED(event)) { - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); @@ -737,7 +737,7 @@ void MyFrame::OnAsyncExec(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnShell(wxCommandEvent& WXUNUSED(event)) { - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); @@ -745,7 +745,7 @@ void MyFrame::OnShell(wxCommandEvent& WXUNUSED(event)) return; int code = wxShell(cmd); - wxLogStatus(_T("Shell command '%s' terminated with exit code %d."), + wxLogStatus(wxT("Shell command '%s' terminated with exit code %d."), cmd.c_str(), code); m_cmdLast = cmd; } @@ -761,7 +761,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) #endif } - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); @@ -769,8 +769,8 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) return; bool sync; - switch ( wxMessageBox(_T("Execute it synchronously?"), - _T("Exec question"), + switch ( wxMessageBox(wxT("Execute it synchronously?"), + wxT("Exec question"), wxYES_NO | wxCANCEL | wxICON_QUESTION, this) ) { case wxYES: @@ -799,8 +799,8 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) if ( code != -1 ) { - ShowOutput(cmd, output, _T("Output")); - ShowOutput(cmd, errors, _T("Errors")); + ShowOutput(cmd, output, wxT("Output")); + ShowOutput(cmd, errors, wxT("Errors")); } } else // async exec @@ -808,7 +808,7 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) MyPipedProcess *process = new MyPipedProcess(this, cmd); if ( !wxExecute(cmd, wxEXEC_ASYNC, process) ) { - wxLogError(_T("Execution of '%s' failed."), cmd.c_str()); + wxLogError(wxT("Execution of '%s' failed."), cmd.c_str()); delete process; } @@ -824,16 +824,16 @@ void MyFrame::OnExecWithRedirect(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event)) { if ( !m_cmdLast ) - m_cmdLast = _T("tr [a-z] [A-Z]"); + m_cmdLast = wxT("tr [a-z] [A-Z]"); - wxString cmd = wxGetTextFromUser(_T("Enter the command: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command: "), DIALOG_TITLE, m_cmdLast); if ( !cmd ) return; - wxString input = wxGetTextFromUser(_T("Enter the string to send to it: "), + wxString input = wxGetTextFromUser(wxT("Enter the string to send to it: "), DIALOG_TITLE); if ( !input ) return; @@ -843,13 +843,13 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event)) long pid = wxExecute(cmd, wxEXEC_ASYNC, process); if ( pid ) { - wxLogStatus(_T("Process %ld (%s) launched."), pid, cmd.c_str()); + wxLogStatus(wxT("Process %ld (%s) launched."), pid, cmd.c_str()); AddPipedProcess(process); } else { - wxLogError(_T("Execution of '%s' failed."), cmd.c_str()); + wxLogError(wxT("Execution of '%s' failed."), cmd.c_str()); delete process; } @@ -859,7 +859,7 @@ void MyFrame::OnExecWithPipe(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(event)) { - wxString cmd = wxGetTextFromUser(_T("Enter the command to launch: "), + wxString cmd = wxGetTextFromUser(wxT("Enter the command to launch: "), DIALOG_TITLE, m_cmdLast); if ( cmd.empty() ) @@ -868,23 +868,23 @@ void MyFrame::OnPOpen(wxCommandEvent& WXUNUSED(event)) wxProcess *process = wxProcess::Open(cmd); if ( !process ) { - wxLogError(_T("Failed to launch the command.")); + wxLogError(wxT("Failed to launch the command.")); return; } - wxLogVerbose(_T("PID of the new process: %ld"), process->GetPid()); + wxLogVerbose(wxT("PID of the new process: %ld"), process->GetPid()); wxOutputStream *out = process->GetOutputStream(); if ( !out ) { - wxLogError(_T("Failed to connect to child stdin")); + wxLogError(wxT("Failed to connect to child stdin")); return; } wxInputStream *in = process->GetInputStream(); if ( !in ) { - wxLogError(_T("Failed to connect to child stdout")); + wxLogError(wxT("Failed to connect to child stdout")); return; } @@ -898,9 +898,9 @@ static bool AskUserForFileName() wxString filename; #if wxUSE_FILEDLG - filename = wxLoadFileSelector(_T("any"), wxEmptyString, gs_lastFile); + filename = wxLoadFileSelector(wxT("any"), wxEmptyString, gs_lastFile); #else // !wxUSE_FILEDLG - filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"), + filename = wxGetTextFromUser(wxT("Enter the file name"), wxT("exec sample"), gs_lastFile); #endif // wxUSE_FILEDLG/!wxUSE_FILEDLG @@ -917,11 +917,11 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event)) if ( !AskUserForFileName() ) return; - wxString ext = gs_lastFile.AfterLast(_T('.')); + wxString ext = gs_lastFile.AfterLast(wxT('.')); wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); if ( !ft ) { - wxLogError(_T("Impossible to determine the file type for extension '%s'"), + wxLogError(wxT("Impossible to determine the file type for extension '%s'"), ext.c_str()); return; } @@ -932,7 +932,7 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event)) delete ft; if ( !ok ) { - wxLogError(_T("Impossible to find out how to open files of extension '%s'"), + wxLogError(wxT("Impossible to find out how to open files of extension '%s'"), ext.c_str()); return; } @@ -953,12 +953,12 @@ void MyFrame::OnFileLaunch(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event)) { - static wxString s_url(_T("http://www.wxwidgets.org/")); + static wxString s_url(wxT("http://www.wxwidgets.org/")); wxString filename = wxGetTextFromUser ( - _T("Enter the URL"), - _T("exec sample"), + wxT("Enter the URL"), + wxT("exec sample"), s_url, this ); @@ -970,7 +970,7 @@ void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event)) if ( !wxLaunchDefaultBrowser(s_url) ) { - wxLogError(_T("Failed to open URL \"%s\""), s_url.c_str()); + wxLogError(wxT("Failed to open URL \"%s\""), s_url.c_str()); } } @@ -982,20 +982,20 @@ void MyFrame::OnOpenURL(wxCommandEvent& WXUNUSED(event)) bool MyFrame::GetDDEServer() { - wxString server = wxGetTextFromUser(_T("Server to connect to:"), + wxString server = wxGetTextFromUser(wxT("Server to connect to:"), DIALOG_TITLE, m_server); if ( !server ) return false; m_server = server; - wxString topic = wxGetTextFromUser(_T("DDE topic:"), DIALOG_TITLE, m_topic); + wxString topic = wxGetTextFromUser(wxT("DDE topic:"), DIALOG_TITLE, m_topic); if ( !topic ) return false; m_topic = topic; - wxString cmd = wxGetTextFromUser(_T("DDE command:"), DIALOG_TITLE, m_cmdDde); + wxString cmd = wxGetTextFromUser(wxT("DDE command:"), DIALOG_TITLE, m_cmdDde); if ( !cmd ) return false; @@ -1013,19 +1013,19 @@ void MyFrame::OnDDEExec(wxCommandEvent& WXUNUSED(event)) wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic); if ( !conn ) { - wxLogError(_T("Failed to connect to the DDE server '%s'."), + wxLogError(wxT("Failed to connect to the DDE server '%s'."), m_server.c_str()); } else { if ( !conn->Execute(m_cmdDde) ) { - wxLogError(_T("Failed to execute command '%s' via DDE."), + wxLogError(wxT("Failed to execute command '%s' via DDE."), m_cmdDde.c_str()); } else { - wxLogStatus(_T("Successfully executed DDE command")); + wxLogStatus(wxT("Successfully executed DDE command")); } } } @@ -1039,19 +1039,19 @@ void MyFrame::OnDDERequest(wxCommandEvent& WXUNUSED(event)) wxConnectionBase *conn = client.MakeConnection(wxEmptyString, m_server, m_topic); if ( !conn ) { - wxLogError(_T("Failed to connect to the DDE server '%s'."), + wxLogError(wxT("Failed to connect to the DDE server '%s'."), m_server.c_str()); } else { if ( !conn->Request(m_cmdDde) ) { - wxLogError(_T("Failed to send request '%s' via DDE."), + wxLogError(wxT("Failed to send request '%s' via DDE."), m_cmdDde.c_str()); } else { - wxLogStatus(_T("Successfully sent DDE request.")); + wxLogStatus(wxT("Successfully sent DDE request.")); } } } @@ -1132,7 +1132,7 @@ void MyFrame::ShowOutput(const wxString& cmd, if ( !count ) return; - m_lbox->Append(wxString::Format(_T("--- %s of '%s' ---"), + m_lbox->Append(wxString::Format(wxT("--- %s of '%s' ---"), title.c_str(), cmd.c_str())); for ( size_t n = 0; n < count; n++ ) @@ -1140,7 +1140,7 @@ void MyFrame::ShowOutput(const wxString& cmd, m_lbox->Append(output[n]); } - m_lbox->Append(wxString::Format(_T("--- End of %s ---"), + m_lbox->Append(wxString::Format(wxT("--- End of %s ---"), title.Lower().c_str())); } @@ -1150,7 +1150,7 @@ void MyFrame::ShowOutput(const wxString& cmd, void MyProcess::OnTerminate(int pid, int status) { - wxLogStatus(m_parent, _T("Process %u ('%s') terminated with exit code %d."), + wxLogStatus(m_parent, wxT("Process %u ('%s') terminated with exit code %d."), pid, m_cmd.c_str(), status); m_parent->OnAsyncTermination(this); @@ -1170,7 +1170,7 @@ bool MyPipedProcess::HasInput() // this assumes that the output is always line buffered wxString msg; - msg << m_cmd << _T(" (stdout): ") << tis.ReadLine(); + msg << m_cmd << wxT(" (stdout): ") << tis.ReadLine(); m_parent->GetLogListBox()->Append(msg); @@ -1183,7 +1183,7 @@ bool MyPipedProcess::HasInput() // this assumes that the output is always line buffered wxString msg; - msg << m_cmd << _T(" (stderr): ") << tis.ReadLine(); + msg << m_cmd << wxT(" (stderr): ") << tis.ReadLine(); m_parent->GetLogListBox()->Append(msg); @@ -1260,13 +1260,13 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent, wxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL); sizerBtns-> - Add(new wxButton(panel, Exec_Btn_Send, _T("&Send")), 0, wxALL, 5); + Add(new wxButton(panel, Exec_Btn_Send, wxT("&Send")), 0, wxALL, 5); sizerBtns-> - Add(new wxButton(panel, Exec_Btn_SendFile, _T("&File...")), 0, wxALL, 5); + Add(new wxButton(panel, Exec_Btn_SendFile, wxT("&File...")), 0, wxALL, 5); sizerBtns-> - Add(new wxButton(panel, Exec_Btn_Get, _T("&Get")), 0, wxALL, 5); + Add(new wxButton(panel, Exec_Btn_Get, wxT("&Get")), 0, wxALL, 5); sizerBtns-> - Add(new wxButton(panel, Exec_Btn_Close, _T("&Close")), 0, wxALL, 5); + Add(new wxButton(panel, Exec_Btn_Close, wxT("&Close")), 0, wxALL, 5); sizerTop->Add(sizerBtns, 0, wxCENTRE | wxALL, 5); sizerTop->Add(m_textIn, 1, wxGROW | wxALL, 5); @@ -1281,11 +1281,11 @@ MyPipeFrame::MyPipeFrame(wxFrame *parent, void MyPipeFrame::OnBtnSendFile(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FILEDLG - wxFileDialog filedlg(this, _T("Select file to send")); + wxFileDialog filedlg(this, wxT("Select file to send")); if ( filedlg.ShowModal() != wxID_OK ) return; - wxFFile file(filedlg.GetFilename(), _T("r")); + wxFFile file(filedlg.GetFilename(), wxT("r")); wxString data; if ( !file.IsOpened() || !file.ReadAll(&data) ) return; @@ -1324,7 +1324,7 @@ void MyPipeFrame::DoGetFromStream(wxTextCtrl *text, wxInputStream& in) while ( in.CanRead() ) { wxChar buffer[4096]; - buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = _T('\0'); + buffer[in.Read(buffer, WXSIZEOF(buffer) - 1).LastRead()] = wxT('\0'); text->AppendText(buffer); } @@ -1373,7 +1373,7 @@ void MyPipeFrame::OnProcessTerm(wxProcessEvent& WXUNUSED(event)) delete m_process; m_process = NULL; - wxLogWarning(_T("The other process has terminated, closing")); + wxLogWarning(wxT("The other process has terminated, closing")); DisableInput(); DisableOutput();