Mercurial > ecos-v2_0-branch

diff host/tools/configtool/standalone/wxwin/admindlg.cpp @ 785:a4d9abbbefff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/makefile.gnu: Build Cygwin hosted configtool with "--subsystem windows" to eliminate the console window. * standalone/wxwin/admindlg.cpp: Strip CR characters from the license text on Linux.
author jld
date Sun, 06 Apr 2003 20:52:02 +0000
parents 7617ab51641e
children
line wrap: on
line diff
--- a/host/tools/configtool/standalone/wxwin/admindlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/admindlg.cpp
@@ -269,9 +269,11 @@ void ecAdminDialog::OnAdd(wxCommandEvent
 #ifdef __WXMSW__
                     if (-1 == strLicenseText.Find (wxT("\r\n"))) // if the file has LF line endings...
                         strLicenseText.Replace (_T("\n"), _T("\r\n")); // ... replace with CRLF line endings
-#endif                    
+#else
+                    strLicenseText.Replace (_T("\r"), wxEmptyString); // remove CR characters
+#endif
                     // display the license text
-                    
+
                     ecLicenseDialog dlgLicense (strLicenseText, this, ecID_LICENSE_DIALOG, strPathName + _(" - Add Packages"));
                     if (wxID_OK != dlgLicense.ShowModal ()) // if license not accepted by user
                         continue; // try the next file