unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / tools / src / tools / configtool / standalone / wxwin / runtestsdlg.cpp

diff --git a/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp b/tools/src/tools/configtool/standalone/wxwin/runtestsdlg.cpp
index 4764958d01f371c97c9d1dcbe2a02cdbb46d0978..679c0b187ca22b2b321f3b11c359d4ced130908e 100644 (file)
--- 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)
     {
     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);
         pWnd->OutputToBuffer(psz);

-#endif

     }
 }
 
     }
 }
 


@@ -988,7 +979,7 @@ void ecRunTestsOutputDialog::CreateControls( wxPanel *parent)
 {
     wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
 {
     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
     item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     // Add context-sensitive help