Mercurial > ecos-v2_0-branch
changeset 785:a4d9abbbefff
* 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 | 8bbe5c525052 |
| children | 3c2a619e9d36 |
| files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/admindlg.cpp host/tools/configtool/standalone/wxwin/makefile.gnu |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,11 @@ +2003-04-05 John Dallaway <jld@ecoscentric.com> + + * 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. + 2003-03-28 John Dallaway <jld@ecoscentric.com> * standalone/wxwin/packagesdlg.cpp: Fix population of package lists
--- 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
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu +++ b/host/tools/configtool/standalone/wxwin/makefile.gnu @@ -27,7 +27,7 @@ EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALL ifeq "$(OSTYPE)" "cygwin" PROGRAM=configtool.exe CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` -D_WIN32 -D__WIN32__ -DSTRICT - LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi + LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi -Wl,--subsystem,windows EXTRAOBJECTS=$(CTBUILDDIR)/configtoolres.o else PROGRAM=configtool