X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-redboot.git;a=blobdiff_plain;f=tools%2Fsrc%2Ftools%2Fconfigtool%2Fstandalone%2Fwxwin%2Fruntestsdlg.cpp;h=679c0b187ca22b2b321f3b11c359d4ced130908e;hp=4764958d01f371c97c9d1dcbe2a02cdbb46d0978;hb=7a4ea0a4d67744fd3f6b5f207d857005fc707b46;hpb=f0c1bd5d9f8457be4a43912a28ca2df207a7f5a4 diff --git a/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp b/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp index 4764958d..679c0b18 100644 --- a/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp +++ b/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp @@ -525,16 +525,7 @@ void CALLBACK ecRunTestsDialog::TestOutputCallback(void *pParam,LPCTSTR psz) ecRunTestsDialog* pWnd = (ecRunTestsDialog*)pParam; if (ecRunTestsDialog::m_runTestsDialog) { - // FIXME: test output should not contain CR characters on non-Windows - // platforms so need to find the root of this problem -#ifndef __WXMSW__ - wxString output(psz); - output.Replace(wxT("\r"), wxEmptyString); // remove CR characters - pWnd->OutputToBuffer(output); -#else - // FIXME ends pWnd->OutputToBuffer(psz); -#endif } } @@ -988,7 +979,7 @@ void ecRunTestsOutputDialog::CreateControls( wxPanel *parent) { wxSizer *item0 = new wxBoxSizer( wxVERTICAL ); - wxTextCtrl *item1 = new wxTextCtrl( parent, ecID_RUN_TESTS_OUTPUT_TEXT, "", wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxCLIP_CHILDREN ); + wxTextCtrl *item1 = new wxTextCtrl( parent, ecID_RUN_TESTS_OUTPUT_TEXT, "", wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE ); item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); // Add context-sensitive help