Mercurial > nand-ecoscentric
changeset 867:6c0eeb4145cb
* standalone/wxwin/symbols.h, standalone/wxwin/aboutdlg.cpp,
standalone/wxwin/configtool.cpp, standalone/wxwin/mainwin.cpp:
Use a character string to represent the configtool version number.
| author | jld |
|---|---|
| date | Tue, 25 Mar 2003 11:47:51 +0000 |
| parents | 14cc4c926c7e |
| children | 61bd80311015 |
| files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/aboutdlg.cpp host/tools/configtool/standalone/wxwin/configtool.cpp host/tools/configtool/standalone/wxwin/mainwin.cpp host/tools/configtool/standalone/wxwin/symbols.h |
| diffstat | 5 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,5 +1,11 @@ 2003-03-25 John Dallaway <jld@ecoscentric.com> + * standalone/wxwin/symbols.h, + standalone/wxwin/aboutdlg.cpp, + standalone/wxwin/configtool.cpp, + standalone/wxwin/mainwin.cpp: Use a character string to represent + the configtool version number. + * standalone/wxwin/runtestsdlg.cpp: Remove CR characters in test output. [ Bugzilla 85163 ]
--- a/host/tools/configtool/standalone/wxwin/aboutdlg.cpp +++ b/host/tools/configtool/standalone/wxwin/aboutdlg.cpp @@ -107,9 +107,7 @@ bool ecAboutDialog::AddControls(wxWindow } // Customize the HTML - wxString verString; - verString.Printf("%.2f", ecCONFIGURATION_TOOL_VERSION); - htmlText.Replace(wxT("$VERSION$"), verString); + htmlText.Replace(wxT("$VERSION$"), ecCONFIGURATION_TOOL_VERSION); htmlText.Replace(wxT("$DATE$"), __DATE__); wxSize htmlSize(420, 390);
--- a/host/tools/configtool/standalone/wxwin/configtool.cpp +++ b/host/tools/configtool/standalone/wxwin/configtool.cpp @@ -246,7 +246,7 @@ bool ecApp::OnInit() wxLog::SetActiveTarget(new wxLogStderr); #endif wxString msg; - msg.Printf(wxT("eCos Configuration Tool (c) Red Hat, 2001 Version %.2f, %s"), ecCONFIGURATION_TOOL_VERSION, __DATE__); + msg.Printf(wxT("eCos Configuration Tool (c) Red Hat, 2001 Version %s, %s"), ecCONFIGURATION_TOOL_VERSION, __DATE__); wxLogMessage(msg); return FALSE; } @@ -658,7 +658,7 @@ bool ecApp::VersionStampSplashScreen() // Bottom left of area to start drawing at wxString verString; - verString.Printf("%.2f", ecCONFIGURATION_TOOL_VERSION); + verString.Printf("%s", ecCONFIGURATION_TOOL_VERSION); int x = 339; int y = 231; #ifdef __WXMSW__
--- a/host/tools/configtool/standalone/wxwin/mainwin.cpp +++ b/host/tools/configtool/standalone/wxwin/mainwin.cpp @@ -89,6 +89,7 @@ #include "folderdlg.h" #include "reposdlg.h" #include "docsystem.h" +#include "symbols.h" #ifdef __WXMSW__ #include "wx/msw/winundef.h" @@ -549,7 +550,9 @@ void ecMainFrame::OnAbout(wxCommandEvent { // ecAboutDialog dialog(this, ecID_ABOUT_DIALOG, _("About eCos Configuration Tool")); // dialog.ShowModal(); - wxMessageBox(_("eCos Configuration Tool 2.13.net\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003"), _("About eCos Configuration Tool"), wxICON_INFORMATION | wxOK); + wxString msg; + msg.Printf("eCos Configuration Tool %s (%s %s)\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003", ecCONFIGURATION_TOOL_VERSION, __DATE__, __TIME__); + wxMessageBox(msg, _("About eCos Configuration Tool"), wxICON_INFORMATION | wxOK); } void ecMainFrame::OnSize(wxSizeEvent& WXUNUSED(event))
--- a/host/tools/configtool/standalone/wxwin/symbols.h +++ b/host/tools/configtool/standalone/wxwin/symbols.h @@ -2,6 +2,7 @@ // // ---------------------------------------------------------------------------- // Copyright (C) 1998, 1999, 2000 Red Hat, Inc. +// Copyright (C) 2003 John Dallaway // // This program is part of the eCos host tools. // @@ -43,7 +44,7 @@ // //=========================================================================== -#define ecCONFIGURATION_TOOL_VERSION 2.12 +#define ecCONFIGURATION_TOOL_VERSION "2.13.net" // Use /ecos-x notation for drive specification #define ecUSE_ECOS_X_NOTATION 1