* Re: configtool wxT patch
@ 2007-11-05 10:34 John Dallaway
2007-11-05 12:29 ` Lars Poeschel
2008-03-26 12:43 ` Lars Poeschel
0 siblings, 2 replies; 5+ messages in thread
From: John Dallaway @ 2007-11-05 10:34 UTC (permalink / raw)
To: Lars Poeschel; +Cc: ecos-patches
Lars
Thank you for the patch. It's been a while, but I have not forgotten
about this. Unicode builds of the eCos Configuration Tool are definitely
desirable. I plan to review your Unicode patches soon. I will need to do
this on both Windows and Linux.
John Dallaway
-------- Original Message --------
Subject: configtool wxT patch
Date: Mon, 29 Oct 2007 22:23:28 +0100
From: Lars Poeschel <larsi@wh2.tu-dresden.de>
To: eCos patches <ecos-patches@ecos.sourceware.org>
Newsgroups: gmane.os.ecos.patches
Hello!
I created a patch that mainly defines string constants the more
"wxWidgets way" using the wxT Macro. This does not change the
functionality but brings the configtool a step towards unicode
compatibility as most modern linux distribution and windows versions use
unicode by default.
Regards,
Lars
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: configtool wxT patch
2007-11-05 10:34 configtool wxT patch John Dallaway
@ 2007-11-05 12:29 ` Lars Poeschel
2008-03-26 12:43 ` Lars Poeschel
1 sibling, 0 replies; 5+ messages in thread
From: Lars Poeschel @ 2007-11-05 12:29 UTC (permalink / raw)
To: John Dallaway; +Cc: ecos-patches
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Am 05.11.2007 um 11:34 schrieb John Dallaway:
>
> Thank you for the patch. It's been a while, but I have not forgotten
> about this. Unicode builds of the eCos Configuration Tool are
> definitely
> desirable. I plan to review your Unicode patches soon. I will need
> to do
> this on both Windows and Linux.
Ok, but don't expect it to work for unicode with this patch. This
patch is only step one. Although I have also done the rest of the
work - at least for the configtool itself, I splittet the patch to
make reviewing easier. If everything is ok with this one, I can
provide the next step.
Lars
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (Darwin)
iD8DBQFHLwy/3m3cZ1XsbwcRAmEjAJ42r0CBxiwIaFELvbpLLmwxHmzgvQCfdeBB
LlfxuiePcZ6NN7CZjjYEKNU=
=1NXq
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: configtool wxT patch
2007-11-05 10:34 configtool wxT patch John Dallaway
2007-11-05 12:29 ` Lars Poeschel
@ 2008-03-26 12:43 ` Lars Poeschel
2008-03-26 13:00 ` John Dallaway
1 sibling, 1 reply; 5+ messages in thread
From: Lars Poeschel @ 2008-03-26 12:43 UTC (permalink / raw)
To: John Dallaway; +Cc: ecos-patches
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Am 05.11.2007 um 11:34 schrieb John Dallaway:
> Lars
>
> Thank you for the patch. It's been a while, but I have not forgotten
> about this. Unicode builds of the eCos Configuration Tool are
> definitely
> desirable. I plan to review your Unicode patches soon. I will need
> to do
> this on both Windows and Linux.
>
> John Dallaway
Hi John!
Could you review the patch ? Is it ready to be included to cvs or are
there some issues I still have to fix ?
I think there is some more work to do (e.g. fixes for wxWidgets 2.8)
and I would volunteer for it, but it is a little downbeating when it
is that difficult to bring the work in.
Thanks,
Lars
> -------- Original Message --------
> Subject: configtool wxT patch
> Date: Mon, 29 Oct 2007 22:23:28 +0100
> From: Lars Poeschel <larsi@wh2.tu-dresden.de>
> To: eCos patches <ecos-patches@ecos.sourceware.org>
> Newsgroups: gmane.os.ecos.patches
>
> Hello!
>
> I created a patch that mainly defines string constants the more
> "wxWidgets way" using the wxT Macro. This does not change the
> functionality but brings the configtool a step towards unicode
> compatibility as most modern linux distribution and windows versions
> use
> unicode by default.
>
> Regards,
>
> Lars
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 194 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: configtool wxT patch
2008-03-26 12:43 ` Lars Poeschel
@ 2008-03-26 13:00 ` John Dallaway
0 siblings, 0 replies; 5+ messages in thread
From: John Dallaway @ 2008-03-26 13:00 UTC (permalink / raw)
To: Lars Poeschel; +Cc: ecos-patches
Hi Lars
Lars Poeschel wrote:
> Could you review the patch ? Is it ready to be included to cvs or are
> there some issues I still have to fix ?
> I think there is some more work to do (e.g. fixes for wxWidgets 2.8) and
> I would volunteer for it, but it is a little downbeating when it is that
> difficult to bring the work in.
Co-incidentally, I've received copyright assignment confirmation for
Andy Jackson's patch today. I will check this in and then start looking
at your unicode patch.
John Dallaway
eCosCentric Limited
^ permalink raw reply [flat|nested] 5+ messages in thread
* configtool wxT patch
@ 2007-10-29 21:24 Lars Poeschel
0 siblings, 0 replies; 5+ messages in thread
From: Lars Poeschel @ 2007-10-29 21:24 UTC (permalink / raw)
To: eCos patches
[-- Attachment #1.1: Type: text/plain, Size: 319 bytes --]
Hello!
I created a patch that mainly defines string constants the more "wxWidgets
way" using the wxT Macro. This does not change the functionality but brings
the configtool a step towards unicode compatibility as most modern linux
distribution and windows versions use unicode by default.
Regards,
Lars
[-- Attachment #1.2: ct-wxT.patch --]
[-- Type: text/x-diff, Size: 64923 bytes --]
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/aboutdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/aboutdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/aboutdlg.cpp 2003-03-25 12:47:51.000000000 +0100
+++ host-tools/host/tools/configtool/standalone/wxwin/aboutdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -94,7 +94,7 @@
wxFile file;
file.Open(htmlFile, wxFile::read);
long len = file.Length();
- char* buf = htmlText.GetWriteBuf(len + 1);
+ wxChar* buf = htmlText.GetWriteBuf(len + 1);
file.Read(buf, len);
buf[len] = 0;
htmlText.UngetWriteBuf();
@@ -108,7 +108,7 @@
// Customize the HTML
htmlText.Replace(wxT("$VERSION$"), ecCONFIGURATION_TOOL_VERSION);
- htmlText.Replace(wxT("$DATE$"), __DATE__);
+ htmlText.Replace(wxT("$DATE$"), wxT(__DATE__));
wxSize htmlSize(420, 390);
@@ -132,7 +132,7 @@
wxASSERT( item1 );
item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *item2 = new wxButton( parent, wxID_CANCEL, "&OK", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item2 = new wxButton( parent, wxID_CANCEL, wxT("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
item2->SetDefault();
item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 10 );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/admindlg.cpp host-tools/host/tools/configtool/standalone/wxwin/admindlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/admindlg.cpp 2003-05-14 20:16:59.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/admindlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -259,7 +259,7 @@
{
//TRACE (_T("License file found at %s\n"), strLicenseFile);
const off_t dwLicenseLength = fileLicenseFile.Length ();
- char* pszBuffer = new char [dwLicenseLength + 1]; // allocate a buffer
+ wxChar* pszBuffer = new wxChar [dwLicenseLength + 1]; // allocate a buffer
fileLicenseFile.Read ((void*) pszBuffer, dwLicenseLength);
fileLicenseFile.Close ();
wxRemoveFile (strLicenseFile); // delete the license file when read
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp host-tools/host/tools/configtool/standalone/wxwin/appsettings.cpp
--- ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp 2003-05-02 15:58:08.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/appsettings.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -229,7 +229,7 @@
while (wxFileExists(fullFilename))
{
i ++;
- postfixStr.Printf("%d", i);
+ postfixStr.Printf(wxT("%d"), i);
fullFilename = filename + postfixStr + wxT(".ecc");
}
@@ -598,7 +598,7 @@
m_strRepository = FindLatestVersion();
#else
// Unsupported platform
- m_strRepositor = wxEmptyString;
+ m_strRepository = wxEmptyString;
#endif
}
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/configpropdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/configpropdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/configpropdlg.cpp 2001-06-02 00:16:29.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/configpropdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -109,7 +109,7 @@
item2->Add( 20, 20, 1, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *item3 = new wxButton( parent, wxID_OK, "&Close", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item3 = new wxButton( parent, wxID_OK, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
item2->Add( item3, 0, wxALIGN_CENTRE|wxALL, 5 );
item0->Add( item2, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/configtool.cpp host-tools/host/tools/configtool/standalone/wxwin/configtool.cpp
--- ecos/host/tools/configtool/standalone/wxwin/configtool.cpp 2006-07-11 11:56:14.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/configtool.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -122,13 +122,13 @@
{ wxCMD_LINE_OPTION, "s", "size", "output block size", wxCMD_LINE_VAL_NUMBER },
{ wxCMD_LINE_OPTION, "d", "date", "output file date", wxCMD_LINE_VAL_DATE },
*/
- { wxCMD_LINE_SWITCH, "h", "help", "displays help on the command line parameters" },
- { wxCMD_LINE_SWITCH, "e", "edit-only", "edit save file only" },
- { wxCMD_LINE_SWITCH, "v", "version", "print version" },
- { wxCMD_LINE_SWITCH, "c", "compile-help", "compile online help only" },
+ { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("displays help on the command line parameters") },
+ { wxCMD_LINE_SWITCH, wxT("e"), wxT("edit-only"), wxT("edit save file only") },
+ { wxCMD_LINE_SWITCH, wxT("v"), wxT("version"), wxT("print version") },
+ { wxCMD_LINE_SWITCH, wxT("c"), wxT("compile-help"), wxT("compile online help only") },
- { wxCMD_LINE_PARAM, NULL, NULL, "input file 1", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
- { wxCMD_LINE_PARAM, NULL, NULL, "input file 2", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_PARAM, NULL, NULL, wxT("input file 1"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_PARAM, NULL, NULL, wxT("input file 2"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE }
};
@@ -234,7 +233,7 @@
m_docManager = new wxDocManager;
// Create a template relating documents to their views
- wxDocTemplate* templ = new wxDocTemplate(m_docManager, "Configtool", "*.ecc", "", "ecc", "Configtool Doc", "Configtool View",
+ wxDocTemplate* templ = new wxDocTemplate(m_docManager, wxT("Configtool"), wxT("*.ecc"), wxT(""), wxT("ecc"), wxT("Configtool Doc"), wxT("Configtool View"),
CLASSINFO(ecConfigToolDoc), CLASSINFO(ecConfigToolView));
// If we've only got one window, we only get to edit
@@ -354,7 +354,7 @@
wxSplitPath(filenameToOpen2, & path2, & name2, & ext2);
// Look at the first file
- if (ext1 == "ecc" || ext1 == "ECC")
+ if (ext1 == wxT("ecc") || ext1 == wxT("ECC"))
{
if (wxFileExists(filenameToOpen1))
{
@@ -364,7 +364,7 @@
else
{
wxString msg;
- msg.Printf("%s is not a valid file.", (const wxChar*) filenameToOpen1);
+ msg.Printf(wxT("%s is not a valid file."), (const wxChar*) filenameToOpen1);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -400,7 +400,7 @@
else
{
wxString msg;
- msg.Printf("%s is neither a project file nor a valid repository.", (const wxChar*) filenameToOpen1);
+ msg.Printf(wxT("%s is neither a project file nor a valid repository."), (const wxChar*) filenameToOpen1);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -408,14 +408,14 @@
// Look at the second file, if any
if (parser.GetParamCount() > 1)
{
- if (ext2 == "ecc" || ext2 == "ECC")
+ if (ext2 == wxT("ecc") || ext2 == wxT("ECC"))
{
if (wxFileExists(filenameToOpen2))
{
if (gotSavefile)
{
wxString msg;
- msg.Printf("%s is a second save file -- please supply only one.", (const wxChar*) filenameToOpen2);
+ msg.Printf(wxT("%s is a second save file -- please supply only one."), (const wxChar*) filenameToOpen2);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -426,7 +426,7 @@
else
{
wxString msg;
- msg.Printf("%s is not a valid file.", (const wxChar*) filenameToOpen2);
+ msg.Printf(wxT("%s is not a valid file."), (const wxChar*) filenameToOpen2);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -441,7 +441,7 @@
if (gotRepository)
{
wxString msg;
- msg.Printf("%s is a second repository -- please supply only one.", (const wxChar*) filenameToOpen2);
+ msg.Printf(wxT("%s is a second repository -- please supply only one."), (const wxChar*) filenameToOpen2);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -470,7 +470,7 @@
else
{
wxString msg;
- msg.Printf("%s is neither a project file nor a valid repository.", (const wxChar*) filenameToOpen2);
+ msg.Printf(wxT("%s is neither a project file nor a valid repository."), (const wxChar*) filenameToOpen2);
wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_EXCLAMATION|wxOK);
return FALSE;
}
@@ -499,7 +499,7 @@
else
{
// Create a new file
- m_docManager->CreateDocument(wxString(""), wxDOC_NEW);
+ m_docManager->CreateDocument(wxString(wxT("")), wxDOC_NEW);
}
if (compileHelpOnly)
@@ -551,7 +551,7 @@
GetSettings().m_strRepository = repository.GetFullPath();
}
}
- m_docManager->CreateDocument(wxString(""), wxDOC_NEW);
+ m_docManager->CreateDocument(wxString(wxT("")), wxDOC_NEW);
}
return TRUE;
@@ -623,7 +623,7 @@
{
wxInputStream* stream = file->GetStream();
- char* buf = text.GetWriteBuf(stream->GetSize() + 1);
+ char* buf = (char *) text.GetWriteBuf(stream->GetSize() + 1);
stream->Read((void*) buf, stream->GetSize());
buf[stream->GetSize()] = 0;
text.UngetWriteBuf();
@@ -638,7 +638,7 @@
{
wxFileInputStream str(GetFullAppPath(filename));
- char* buf = text.GetWriteBuf(str.GetSize() + 1);
+ char* buf = (char *) text.GetWriteBuf(str.GetSize() + 1);
str.Read((void*) buf, str.GetSize());
buf[str.GetSize()] = 0;
text.UngetWriteBuf();
@@ -661,7 +661,7 @@
{
wxInputStream* stream = file->GetStream();
- char* buf = text.GetWriteBuf(stream->GetSize() + 1);
+ char* buf = (char *) text.GetWriteBuf(stream->GetSize() + 1);
stream->Read((void*) buf, stream->GetSize());
buf[stream->GetSize()] = 0;
text.UngetWriteBuf();
@@ -689,7 +689,7 @@
// Bottom left of area to start drawing at
wxString verString;
- verString.Printf("%s", ecCONFIGURATION_TOOL_VERSION);
+ verString.Printf(wxT("%s"), ecCONFIGURATION_TOOL_VERSION);
int x = 339; int y = 231;
#ifdef __WXMSW__
@@ -1367,8 +1367,7 @@
if (pDoc->IsModified()) // if document has been modified since last save
{
- if (wxOK == wxMessageBox("Building eCos will save changes to your current eCos configuration.",
- "Build", wxOK|wxCANCEL|wxICON_EXCLAMATION))
+ if (wxOK == wxMessageBox(wxT("Building eCos will save changes to your current eCos configuration."), wxT("Build"), wxOK|wxCANCEL|wxICON_EXCLAMATION))
pDoc->Save();
else
return; // user chose not to save changes so cannot build eCos
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp host-tools/host/tools/configtool/standalone/wxwin/configtooldoc.cpp
--- ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp 2003-05-14 20:16:59.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/configtooldoc.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -772,12 +775,12 @@
default_template = templates [0];
}
- m_templateVersion = "";
+ m_templateVersion = wxT("");
try
{
const std::vector<std::string>& template_versions = NewCdlPkgData->get_template_versions (default_template);
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/configtree.cpp host-tools/host/tools/configtool/standalone/wxwin/configtree.cpp
--- ecos/host/tools/configtool/standalone/wxwin/configtree.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/configtree.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -144,30 +144,30 @@
// We associate names and states so we can easily get the appropriate
// icon for a given tree item. This gets used in ecConfigItem::UpdateTreeIcon.
- m_iconDB.AddInfo("Container", wxICON(closedfolder), 0, TRUE);
- m_iconDB.AddInfo("Container", wxICON(closedfolder_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Container"), wxICON(closedfolder), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Container"), wxICON(closedfolder_dis), 0, FALSE);
- m_iconDB.AddInfo("Package", wxICON(package_open), 0, TRUE);
- m_iconDB.AddInfo("Package", wxICON(package_open_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Package"), wxICON(package_open), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Package"), wxICON(package_open_dis), 0, FALSE);
- m_iconDB.AddInfo("Checkbox", wxICON(checked), 0, TRUE);
- m_iconDB.AddInfo("Checkbox", wxICON(checked_dis), 0, FALSE);
- m_iconDB.AddInfo("Checkbox", wxICON(unchecked), 1, TRUE);
- m_iconDB.AddInfo("Checkbox", wxICON(unchecked_dis), 1, FALSE);
+ m_iconDB.AddInfo(wxT("Checkbox"), wxICON(checked), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Checkbox"), wxICON(checked_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Checkbox"), wxICON(unchecked), 1, TRUE);
+ m_iconDB.AddInfo(wxT("Checkbox"), wxICON(unchecked_dis), 1, FALSE);
- m_iconDB.AddInfo("Radiobox", wxICON(radioon), 0, TRUE);
- m_iconDB.AddInfo("Radiobox", wxICON(radioon_dis), 0, FALSE);
- m_iconDB.AddInfo("Radiobox", wxICON(radiooff), 1, TRUE);
- m_iconDB.AddInfo("Radiobox", wxICON(radiooff_dis), 1, FALSE);
+ m_iconDB.AddInfo(wxT("Radiobox"), wxICON(radioon), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Radiobox"), wxICON(radioon_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Radiobox"), wxICON(radiooff), 1, TRUE);
+ m_iconDB.AddInfo(wxT("Radiobox"), wxICON(radiooff_dis), 1, FALSE);
- m_iconDB.AddInfo("Text", wxICON(text), 0, TRUE);
- m_iconDB.AddInfo("Text", wxICON(text_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Text"), wxICON(text), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Text"), wxICON(text_dis), 0, FALSE);
- m_iconDB.AddInfo("Enumerated", wxICON(enumerated), 0, TRUE);
- m_iconDB.AddInfo("Enumerated", wxICON(enumerated_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Enumerated"), wxICON(enumerated), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Enumerated"), wxICON(enumerated_dis), 0, FALSE);
- m_iconDB.AddInfo("Integer", wxICON(integer), 0, TRUE);
- m_iconDB.AddInfo("Integer", wxICON(integer_dis), 0, FALSE);
+ m_iconDB.AddInfo(wxT("Integer"), wxICON(integer), 0, TRUE);
+ m_iconDB.AddInfo(wxT("Integer"), wxICON(integer_dis), 0, FALSE);
#if 0
// Add some dummy items
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/conflictwin.cpp host-tools/host/tools/configtool/standalone/wxwin/conflictwin.cpp
--- ecos/host/tools/configtool/standalone/wxwin/conflictwin.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/conflictwin.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -90,9 +90,9 @@
SetFont(wxGetApp().GetSettings().GetWindowSettings().GetFont(wxT("Conflicts")));
}
- InsertColumn(0, "Item", wxLIST_FORMAT_LEFT, 200);
- InsertColumn(1, "Conflict", wxLIST_FORMAT_LEFT, 80);
- InsertColumn(2, "Property", wxLIST_FORMAT_LEFT, 200);
+ InsertColumn(0, wxT("Item"), wxLIST_FORMAT_LEFT, 200);
+ InsertColumn(1, wxT("Conflict"), wxLIST_FORMAT_LEFT, 80);
+ InsertColumn(2, wxT("Property"), wxLIST_FORMAT_LEFT, 200);
m_contextMenu = new wxMenu;
m_contextMenu->Append(ecID_WHATS_THIS, _("&What's This?"));
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/docsystem.cpp host-tools/host/tools/configtool/standalone/wxwin/docsystem.cpp
--- ecos/host/tools/configtool/standalone/wxwin/docsystem.cpp 2003-04-25 11:16:33.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/docsystem.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -166,15 +166,15 @@
wxSimpleHtmlParser parser;
if (parser.ParseFile(htmlFile))
{
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(title) << wxString("\">");
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(title) << wxString("\">", *wxConvCurrent);
if (!topURL.IsEmpty())
{
- stream << "<param name=\"Local\" value=\"";
- stream << topURL1 << "\"></OBJECT>";
+ stream << wxT("<param name=\"Local\" value=\"");
+ stream << topURL1 << wxT("\"></OBJECT>");
}
- stream << "\n";
+ stream << wxT("\n");
int indent = startIndent;
wxSimpleHtmlTag* tag = parser.GetTopLevelTag()->GetChildren();
@@ -183,31 +183,31 @@
if (tag->GetType() == wxSimpleHtmlTag_Open)
{
wxSimpleHtmlAttribute* attr = NULL;
- if ((tag->NameIs("P") || tag->NameIs("DIV") ||
- tag->NameIs("H1") || tag->NameIs("H2") || tag->NameIs("H3") || tag->NameIs("H4"))
+ if ((tag->NameIs(wxT("P")) || tag->NameIs(wxT("DIV")) ||
+ tag->NameIs(wxT("H1")) || tag->NameIs(wxT("H2")) || tag->NameIs(wxT("H3")) || tag->NameIs(wxT("H4")))
&&
- (attr = tag->FindAttribute("CLASS")))
+ (attr = tag->FindAttribute(wxT("CLASS"))))
{
int level = -1;
- if (attr->HasValue("Level1IX") ||
- attr->HasValue("SectionTitleTOC") ||
- attr->HasValue("IndexTitleTOC"))
+ if (attr->HasValue(wxT("Level1IX")) ||
+ attr->HasValue(wxT("SectionTitleTOC")) ||
+ attr->HasValue(wxT("IndexTitleTOC")))
level = 1;
- else if (attr->HasValue("Level2IX") ||
- attr->HasValue("ChapterTitleTOC") ||
- attr->HasValue("IntroTitleTOC"))
+ else if (attr->HasValue(wxT("Level2IX")) ||
+ attr->HasValue(wxT("ChapterTitleTOC")) ||
+ attr->HasValue(wxT("IntroTitleTOC")))
level = 2;
- else if (attr->HasValue("Heading1TOC"))
+ else if (attr->HasValue(wxT("Heading1TOC")))
level = 3;
- else if (attr->HasValue("Heading2TOC"))
+ else if (attr->HasValue(wxT("Heading2TOC")))
level = 4;
if (level > -1)
{
- wxSimpleHtmlTag* aTag = tag->FindTag("A", "HREF");
+ wxSimpleHtmlTag* aTag = tag->FindTag(wxT("A"), wxT("HREF"));
if (aTag)
CreateHHCOutputItem(aTag, level, indent, pathPrefix, docDir, stream);
}
@@ -221,8 +221,8 @@
while (indent > startIndent)
{
indent --;
- for (i = 0; i < indent*2; i++) stream << " ";
- stream << "</UL>\n";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
+ stream << wxT("</UL>\n");
}
return TRUE;
@@ -298,23 +298,23 @@
wxSimpleHtmlParser parser;
if (parser.ParseFile(htmlFile))
{
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(title) << wxString("\">");
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(title) << wxString("\">", *wxConvCurrent);
if (!topURL.IsEmpty())
{
- stream << "<param name=\"Local\" value=\"";
- stream << topURL1 << "\"></OBJECT>";
+ stream << wxT("<param name=\"Local\" value=\"");
+ stream << topURL1 << wxT("\"></OBJECT>");
}
- stream << "\n";
+ stream << wxT("\n");
int indent = startIndent; int level = 0;
wxSimpleHtmlTag* tag = parser.GetTopLevelTag()->GetChildren();
while (tag)
{
- if (tag->GetType() == wxSimpleHtmlTag_Open && tag->NameIs("DL")) level ++ ;
- if (tag->GetType() == wxSimpleHtmlTag_Close && tag->NameIs("DL")) level -- ;
- if (tag->GetType() == wxSimpleHtmlTag_Open && tag->NameIs("A") && tag->HasAttribute("HREF") && level > 0)
+ if (tag->GetType() == wxSimpleHtmlTag_Open && tag->NameIs(wxT("DL"))) level ++ ;
+ if (tag->GetType() == wxSimpleHtmlTag_Close && tag->NameIs(wxT("DL"))) level -- ;
+ if (tag->GetType() == wxSimpleHtmlTag_Open && tag->NameIs(wxT("A")) && tag->HasAttribute(wxT("HREF")) && level > 0)
CreateHHCOutputItem(tag, level, indent, pathPrefix, docDir, stream);
// If we get to list of figures/tables/examples, finish
@@ -337,8 +337,8 @@
while (indent > startIndent)
{
indent --;
- for (i = 0; i < indent*2; i++) stream << " ";
- stream << "</UL>\n";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
+ stream << wxT("</UL>\n");
}
return TRUE;
}
@@ -355,11 +355,11 @@
topURL1 = docDir + sep + topURL1;
int i;
- for (i = 0; i < indent*2; i++) stream << " ";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(title) << "\"><param name=\"Local\" value=\"";
- stream << topURL1 << "\"></OBJECT>\n";
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(title) << wxT("\"><param name=\"Local\" value=\"");
+ stream << topURL1 << wxT("\"></OBJECT>\n");
return TRUE;
}
@@ -367,10 +367,10 @@
void ecHtmlIndexer::CreateHHCOutputItem(wxSimpleHtmlTag* tag, int level, int& indent, const wxString& pathPrefix, const wxString& docDir, wxOutputStream& stream)
{
wxString url, text;
- tag->GetAttributeValue(url, "HREF");
- tag->FindTextUntilTagClose(text, "A");
+ tag->GetAttributeValue(url, wxT("HREF"));
+ tag->FindTextUntilTagClose(text, wxT("A"));
text.Trim(TRUE); // Trim spaces from right of string
- text.Replace("\n", " "); // Remove newlines
+ text.Replace(wxT("\n"), wxT(" ")); // Remove newlines
// Need to adjust the URL to give the path relative to where the index is
url = pathPrefix + wxString(wxT("/")) + url;
@@ -383,52 +383,52 @@
int i;
while (level > indent)
{
- for (i = 0; i < indent*2; i++) stream << " ";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
- stream << "<UL>";
+ stream << wxT("<UL>");
indent ++;
// If we're skipping one or more levels, we need to insert
// a dummy node.
if (level > indent)
{
- stream << "\n";
- for (i = 0; i < indent*2; i++) stream << " ";
+ stream << wxT("\n");
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(text) << "\"><param name=\"Local\" value=\"";
- stream << url1 << "\"></OBJECT>";
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(text) << wxT("\"><param name=\"Local\" value=\"");
+ stream << url1 << wxT("\"></OBJECT>");
}
- stream << "\n";
+ stream << wxT("\n");
}
while (level < indent)
{
indent--;
- for (i = 0; i < indent*2; i++) stream << " ";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
- stream << "</UL>\n";
+ stream << wxT("</UL>\n");
}
- for (i = 0; i < indent*2; i++) stream << " ";
+ for (i = 0; i < indent*2; i++) stream << wxT(" ");
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(text) << "\"><param name=\"Local\" value=\"";
- stream << url1 << "\"></OBJECT>\n";
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(text) << wxT("\"><param name=\"Local\" value=\"");
+ stream << url1 << wxT("\"></OBJECT>\n");
}
void ecHtmlIndexer::CreateHHCWriteHeader(wxOutputStream& stream)
{
- stream << "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n";
- stream << "<HTML>\n<HEAD>\n<meta name=\"GENERATOR\" content=\"Microsoft® HTML Help Workshop 4.1\">\n";
- stream << "<!-- Sitemap 1.0 -->\n</HEAD><BODY>\n";
- stream << "<UL>\n";
+ stream << wxT("<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n");
+ stream << wxT("<HTML>\n<HEAD>\n<meta name=\"GENERATOR\" content=\"Microsoft® HTML Help Workshop 4.1\">\n");
+ stream << wxT("<!-- Sitemap 1.0 -->\n</HEAD><BODY>\n");
+ stream << wxT("<UL>\n");
}
void ecHtmlIndexer::CreateHHCWriteFooter(wxOutputStream& stream)
{
- stream << "</UL>\n";
- stream << "</BODY></HTML>";
+ stream << wxT("</UL>\n");
+ stream << wxT("</BODY></HTML>");
}
bool ecHtmlIndexer::CreateHHCStartSection(const wxString& title, const wxString& topURL, const wxString& docDir, wxOutputStream& stream)
@@ -438,21 +438,21 @@
if (!UseRelativeURLs() && !wxIsAbsolutePath(url1))
url1 = docDir + sep + url1;
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(title) << wxString("\">");
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(title) << wxString("\">", *wxConvCurrent);
if (!topURL.IsEmpty())
{
- stream << "<param name=\"Local\" value=\"";
- stream << url1 << "\">" ;
+ stream << wxT("<param name=\"Local\" value=\"");
+ stream << url1 << wxT("\">") ;
}
- stream << "</OBJECT>\n<UL>\n" ;
+ stream << wxT("</OBJECT>\n<UL>\n") ;
return TRUE;
}
bool ecHtmlIndexer::CreateHHCEndSection(wxOutputStream& stream)
{
- stream << "</UL>\n";
+ stream << wxT("</UL>\n");
return TRUE;
}
@@ -469,34 +469,34 @@
wxString contentsFile(name + wxT(".hhc"));
wxString keywordFile(name + wxT(".hhk"));
- stream << "[OPTIONS]\n\
+ stream << wxT("[OPTIONS]\n\
Auto Index=Yes\n\
Binary Index=No\n\
Compatibility=1.1 or later\n\
-Compiled file=";
- stream << compiledFile << "\nContents file=" << contentsFile << "\n";
+Compiled file=");
+ stream << compiledFile << wxT("\nContents file=") << contentsFile << wxT("\n");
stream <<
-"Default Window=mainwin\n\
-Default topic=";
+wxT("Default Window=mainwin\n\
+Default topic=");
if (!UseRelativeURLs())
stream << docDir + sep;
- stream << wxT("index.html") << "\n\
+ stream << wxT("index.html") << wxT("\n\
Display compile progress=Yes\n\
-Full-text search=Yes\n" <<
+Full-text search=Yes\n") <<
// Index file=" << keywordFile << "\n
-"Language=0x409 English (United States)\n\
-Title=eCos\n";
+wxT("Language=0x409 English (United States)\n\
+Title=eCos\n");
stream <<
-"[WINDOWS]\n\
+wxT("[WINDOWS]\n\
mainwin=\"eCos Documentation\",\"eCos.hhc\",,,\"index.html\",\"http://sources.redhat.com/ecos/\",\"Net Release\",\"http://www.redhat.com/products/ecos/\",\"eCos Product\",0x40060420,,0xc287e,[0,0,762,400],,,,,,,0\n\
\n\
[FILES]\n\
index.html\n\
\n\
-[INFOTYPES]\n" ;
+[INFOTYPES]\n") ;
// When we have the ability to generate a hhk, replace above line with:
// mainwin=\"eCos Documentation\",\"eCos.hhc\",\"eCos.hhk\",,\"index.html\",\"http://sources.redhat.com/ecos/\",\"Net Release\",\"http://www.redhat.com/products/ecos/\",\"eCos Product\",0x40060420,,0xc287e,[0,0,762,400],,,,,,,0\n\
@@ -516,15 +516,15 @@
// If we have multiple tutorials or whatever, then we need to repeat this line ONCE
// and then generate the multiple files. Otherwise we'll be repeating the same "Getting Started with eCos"
// line. I.e. it'll only look right if we only have one tutorial.
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(title) << wxString("\">");
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(title) << wxString("\">", *wxConvCurrent);
if (!topURL.IsEmpty())
{
- stream << "<param name=\"Local\" value=\"";
- stream << topURL << "\">" ;
+ stream << wxT("<param name=\"Local\" value=\"");
+ stream << topURL << wxT("\">") ;
}
- stream << "</OBJECT>\n<UL>\n" ;
+ stream << wxT("</OBJECT>\n<UL>\n") ;
// generate the contents of the add/remove list boxes
const std::vector<std::string> & packages = doc->GetCdlPkgData ()->get_packages ();
@@ -548,20 +548,20 @@
url = htmlPath + wxString(wxFILE_SEP_PATH) + Redirect(htmlPath, url);
- stream << "<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"";
- stream << TranslateEntities(strPackageName) << wxString("\">");
+ stream << wxT("<LI> <OBJECT type=\"text/sitemap\"><param name=\"Name\" value=\"");
+ stream << TranslateEntities(strPackageName) << wxString("\">", *wxConvCurrent);
if (!url.IsEmpty())
{
- stream << "<param name=\"Local\" value=\"";
- stream << url << "\">" ;
+ stream << wxT("<param name=\"Local\" value=\"");
+ stream << url << wxT("\">") ;
}
- stream << "</OBJECT>\n" ;
+ stream << wxT("</OBJECT>\n") ;
}
}
}
- stream << "</UL>\n";
+ stream << wxT("</UL>\n");
return TRUE;
}
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/ecutils.cpp host-tools/host/tools/configtool/standalone/wxwin/ecutils.cpp
--- ecos/host/tools/configtool/standalone/wxwin/ecutils.cpp 2003-04-11 12:22:36.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/ecutils.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -822,14 +827,14 @@
wxOutputStream& operator <<(wxOutputStream& stream, long l)
{
wxString str;
- str.Printf("%ld", l);
+ str.Printf(wxT("%ld"), l);
return stream << str;
}
wxOutputStream& operator <<(wxOutputStream& stream, const char c)
{
wxString str;
- str.Printf("%c", c);
+ str.Printf(wxT("%c"), c);
return stream << str;
}
@@ -1483,17 +1488,17 @@
{
arPinfo.clear();
int i;
- FILE *f=popen("ps -l",_T("r") MODE_TEXT);
+ FILE *f=popen("ps -l","r" MODE_TEXT);
if(f){
- char buf[100];
- while(fgets(buf,sizeof(buf)-1,f)){
+ TCHAR buf[100];
+ while(_fgetts(buf,sizeof(buf)-1,f)){
TCHAR discard[100];
wxPInfo p;
// Output is in the form
// F S UID PID PPID C PRI NI ADDR SZ WCHAN TTY TIME CMD
//100 S 490 877 876 0 70 0 - 368 wait4 pts/0 00:00:00 bash
- int F,UID,C,PRI,NI,SZ,HH,MM,SS;
- bool rc=(15==_stscanf(buf,_T("%d %s %d %d %d %d %d %d %s %d %s %s %d:%d:%d"),&F,discard,&UID,&p.PID,&p.PPID,&C,&PRI,&NI,discard,&SZ,discard,discard,&HH,&MM,&SS));
+ int F,UID,C,PRI,NI,SZ,HH,MM,SS;
+ bool rc=(15==_stscanf(buf,wxT("%d %s %d %d %d %d %d %d %s %d %s %s %d:%d:%d"),&F,discard,&UID,&p.PID,&p.PPID,&C,&PRI,&NI,discard,&SZ,discard,discard,&HH,&MM,&SS));
if(rc){
p.tCpu=1000*(SS+60*(60*HH+MM));
arPinfo.push_back(p);
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/filename.cpp host-tools/host/tools/configtool/standalone/wxwin/filename.cpp
--- ecos/host/tools/configtool/standalone/wxwin/filename.cpp 2003-03-19 18:39:06.000000000 +0100
+++ host-tools/host/tools/configtool/standalone/wxwin/filename.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -383,7 +383,7 @@
return FALSE ;
#else
wxStructStat st;
- if ((*this) != wxT("") && wxStat (wxFNSTRINGCAST fn_str(), &st) == 0 && (st.st_mode & S_IFREG))
+ if ((*this) != wxT("") && wxStat (wxString(wxFNSTRINGCAST fn_str(), *wxConvCurrent), &st) == 0 && (st.st_mode & S_IFREG))
return TRUE;
return FALSE;
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/folderdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/folderdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/folderdlg.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/folderdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -166,7 +166,7 @@
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString *strs7 = (wxString*) NULL;
- wxComboBox *item7 = new wxComboBox( parent, ecID_FOLDER_DIALOG_PATHS, "", wxDefaultPosition, wxSize(470,-1), 0, strs7, wxCB_DROPDOWN );
+ wxComboBox *item7 = new wxComboBox( parent, ecID_FOLDER_DIALOG_PATHS, wxT(""), wxDefaultPosition, wxSize(470,-1), 0, strs7, wxCB_DROPDOWN );
item0->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
parent->SetAutoLayout( TRUE );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/htmlparser.cpp host-tools/host/tools/configtool/standalone/wxwin/htmlparser.cpp
--- ecos/host/tools/configtool/standalone/wxwin/htmlparser.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/htmlparser.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -746,37 +746,37 @@
}
case wxSimpleHtmlTag_Open:
{
- stream << "<" << m_name;
+ stream << wxT("<") << m_name;
if (GetAttributeCount() > 0)
- stream << " ";
+ stream << wxT(" ");
int i;
for (i = 0; i < GetAttributeCount(); i++)
{
wxSimpleHtmlAttribute* attr = GetAttribute(i);
attr->Write(stream);
if (i < GetAttributeCount() - 1)
- stream << " ";
+ stream << wxT(" ");
}
- stream << ">\n";
+ stream << wxT(">\n");
break;
}
case wxSimpleHtmlTag_Directive:
{
- stream << "<!" << m_name << " ";
+ stream << wxT("<!") << m_name << wxT(" ");
int i;
for (i = 0; i < GetAttributeCount(); i++)
{
wxSimpleHtmlAttribute* attr = GetAttribute(i);
attr->Write(stream);
if (i < GetAttributeCount() - 1)
- stream << " ";
+ stream << wxT(" ");
}
- stream << ">\n";
+ stream << wxT(">\n");
break;
}
case wxSimpleHtmlTag_Close:
{
- stream << "</" << m_name << ">\n";
+ stream << wxT("</") << m_name << wxT(">\n");
break;
}
default:
@@ -800,8 +800,8 @@
else
{
stream << m_name;
- stream << "=\"";
+ stream << wxT("=\"");
stream << m_value;
- stream << "\"";
+ stream << wxT("\"");
}
}
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/mainwin.cpp host-tools/host/tools/configtool/standalone/wxwin/mainwin.cpp
--- ecos/host/tools/configtool/standalone/wxwin/mainwin.cpp 2006-07-11 11:56:14.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/mainwin.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -552,7 +557,7 @@
// ecAboutDialog dialog(this, ecID_ABOUT_DIALOG, _("About eCos Configuration Tool"));
// dialog.ShowModal();
wxString msg;
- msg.Printf("eCos Configuration Tool %s (%s %s)\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003\nCopyright (c) eCosCentric Limited 2004-2006", ecCONFIGURATION_TOOL_VERSION, __DATE__, __TIME__);
+ msg.Printf(wxT("eCos Configuration Tool %s (%s %s)\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003\nCopyright (c) eCosCentric Limited 2004-2006"), ecCONFIGURATION_TOOL_VERSION, __DATE__, __TIME__);
wxMessageBox(msg, _("About eCos Configuration Tool"), wxICON_INFORMATION | wxOK);
}
@@ -627,25 +632,25 @@
toolBar->AddSeparator();
- toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Cut");
- toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Copy");
- toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Paste");
- toolBar->AddTool(wxID_FIND, toolBarBitmaps[6], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Search");
+ toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Cut"));
+ toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Copy"));
+ toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Paste"));
+ toolBar->AddTool(wxID_FIND, toolBarBitmaps[6], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Search"));
toolBar->AddSeparator();
- toolBar->AddTool(ecID_STOP_BUILD, toolBarBitmaps[7], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Stop build");
- toolBar->AddTool(ecID_BUILD_LIBRARY, toolBarBitmaps[8], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Build library");
+ toolBar->AddTool(ecID_STOP_BUILD, toolBarBitmaps[7], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Stop build"));
+ toolBar->AddTool(ecID_BUILD_LIBRARY, toolBarBitmaps[8], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Build library"));
#if ecUSE_MLT
toolBar->AddSeparator();
- toolBar->AddTool(ecID_NEW_REGION, toolBarBitmaps[10], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "New region");
- toolBar->AddTool(ecID_NEW_SECTION, toolBarBitmaps[11], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "New section");
- toolBar->AddTool(ecID_DELETE, toolBarBitmaps[12], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Delete");
- toolBar->AddTool(ecID_PROPERTIES, toolBarBitmaps[13], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Properties");
+ toolBar->AddTool(ecID_NEW_REGION, toolBarBitmaps[10], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("New region"));
+ toolBar->AddTool(ecID_NEW_SECTION, toolBarBitmaps[11], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("New section"));
+ toolBar->AddTool(ecID_DELETE, toolBarBitmaps[12], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Delete"));
+ toolBar->AddTool(ecID_PROPERTIES, toolBarBitmaps[13], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Properties"));
#endif
toolBar->AddSeparator();
- toolBar->AddTool(ecID_CONTEXT_HELP, toolBarBitmaps[14], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Show help for clicked-on windows");
- toolBar->AddTool(ecID_ECOS_HELP, toolBarBitmaps[9], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, "Show help");
+ toolBar->AddTool(ecID_CONTEXT_HELP, toolBarBitmaps[14], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help for clicked-on windows"));
+ toolBar->AddTool(ecID_ECOS_HELP, toolBarBitmaps[9], wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, wxT("Show help"));
// after adding the buttons to the toolbar, must call Realize() to reflect
// the changes
@@ -1187,7 +1196,7 @@
if (!doc)
{
- doc = (ecConfigToolDoc*) wxGetApp().GetDocManager()->CreateDocument(wxString(""), wxDOC_NEW|ecDOC_PROMPT_FOR_REPOSITORY);
+ doc = (ecConfigToolDoc*) wxGetApp().GetDocManager()->CreateDocument(wxString(wxT("")), wxDOC_NEW|ecDOC_PROMPT_FOR_REPOSITORY);
return;
}
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp host-tools/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp 2003-02-19 17:15:37.000000000 +0100
+++ host-tools/host/tools/configtool/standalone/wxwin/platformeditordlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -148,7 +148,7 @@
item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString *strs5 = (wxString*) NULL;
- wxComboBox *item5 = new wxComboBox( parent, ecID_MODIFY_PLATFORM_PREFIX, "", wxDefaultPosition, wxDefaultSize, 0, strs5, wxCB_DROPDOWN );
+ wxComboBox *item5 = new wxComboBox( parent, ecID_MODIFY_PLATFORM_PREFIX, wxT(""), wxDefaultPosition, wxDefaultSize, 0, strs5, wxCB_DROPDOWN );
item1->Add( item5, 0, wxGROW|wxALL, 5 );
wxStaticText *item6 = new wxStaticText( parent, wxID_STATIC, _("Arguments for &GDB:"), wxDefaultPosition, wxDefaultSize, 0 );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/propertywin.cpp host-tools/host/tools/configtool/standalone/wxwin/propertywin.cpp
--- ecos/host/tools/configtool/standalone/wxwin/propertywin.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/propertywin.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -189,8 +189,8 @@
void ecPropertyListCtrl::AddColumns()
{
- InsertColumn(0, "Property", wxLIST_FORMAT_LEFT, 100);
- InsertColumn(1, "Value", wxLIST_FORMAT_LEFT, 300);
+ InsertColumn(0, wxT("Property"), wxLIST_FORMAT_LEFT, 100);
+ InsertColumn(1, wxT("Value"), wxLIST_FORMAT_LEFT, 300);
}
void ecPropertyListCtrl::Fill(ecConfigItem *pti)
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/reposdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/reposdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/reposdlg.cpp 2002-01-04 15:13:53.000000000 +0100
+++ host-tools/host/tools/configtool/standalone/wxwin/reposdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -126,7 +126,7 @@
wxASSERT( item1 );
item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *item2 = new wxButton( parent, wxID_CANCEL, "&OK", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item2 = new wxButton( parent, wxID_CANCEL, wxT("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
#if 0
item2->SetBackgroundColour(buttonBackgroundColour);
item2->SetForegroundColour(buttonForegroundColour);
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp 2003-05-14 14:20:15.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -169,13 +169,13 @@
wxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
- wxButton *runButton = new wxButton( this, ecID_RUN_TESTS_RUN, "&Run", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *runButton = new wxButton( this, ecID_RUN_TESTS_RUN, wxT("&Run"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( runButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *okButton = new wxButton( this, wxID_OK, "&Close", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *okButton = new wxButton( this, wxID_OK, wxT("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( okButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *propertiesButton = new wxButton( this, ecID_RUN_TESTS_PROPERTIES, "&Properties...", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *propertiesButton = new wxButton( this, ecID_RUN_TESTS_PROPERTIES, wxT("&Properties..."), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( propertiesButton, 0, wxALIGN_CENTRE|wxALL, 5 );
/*
@@ -689,27 +689,27 @@
wxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
- wxButton *item2 = new wxButton( parent, ecID_RUN_TESTS_CHECK_ALL, "C&heck All", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item2 = new wxButton( parent, ecID_RUN_TESTS_CHECK_ALL, wxT("C&heck All"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( item2, 0, wxALIGN_CENTRE|wxALL, 5 );
item1->Add( 2, 2, 1, wxALIGN_CENTRE|wxALL, 0 );
- wxButton *item3 = new wxButton( parent, ecID_RUN_TESTS_UNCHECK_ALL, "&Uncheck All", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item3 = new wxButton( parent, ecID_RUN_TESTS_UNCHECK_ALL, wxT("&Uncheck All"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( item3, 0, wxALIGN_CENTRE|wxALL, 5 );
item1->Add( 2, 2, 1, wxALIGN_CENTRE|wxALL, 0 );
- wxButton *item4 = new wxButton( parent, ecID_RUN_TESTS_ADD, "&Add...", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item4 = new wxButton( parent, ecID_RUN_TESTS_ADD, wxT("&Add..."), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( item4, 0, wxALIGN_CENTRE|wxALL, 5 );
item1->Add( 2, 2, 1, wxALIGN_CENTRE|wxALL, 0 );
- wxButton *item5 = new wxButton( parent, ecID_RUN_TESTS_ADD_FOLDER, "Add from &Folder...", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item5 = new wxButton( parent, ecID_RUN_TESTS_ADD_FOLDER, wxT("Add from &Folder..."), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( item5, 0, wxALIGN_CENTRE|wxALL, 5 );
item1->Add( 2, 2, 1, wxALIGN_CENTRE|wxALL, 0 );
- wxButton *item6 = new wxButton( parent, ecID_RUN_TESTS_REMOVE, "&Remove", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *item6 = new wxButton( parent, ecID_RUN_TESTS_REMOVE, wxT("&Remove"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( item6, 0, wxALIGN_CENTRE|wxALL, 5 );
item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
@@ -988,7 +988,7 @@
{
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, wxT(""), wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxCLIP_CHILDREN );
item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
// Add context-sensitive help
@@ -1039,15 +1039,15 @@
void ecRunTestsSummaryDialog::CreateControls( wxPanel *parent)
{
m_listCtrl = new wxListCtrl(parent, ecID_RUN_TESTS_SUMMARY_LIST, wxDefaultPosition, wxSize(100, 100), wxSUNKEN_BORDER|wxLC_REPORT);
- m_listCtrl->InsertColumn(0, "Time", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(1, "Host", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(2, "Platform", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(3, "Executable", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(4, "Status", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(5, "Size", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(6, "Download", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(7, "Elapsed", wxLIST_FORMAT_LEFT, 60);
- m_listCtrl->InsertColumn(8, "Execution", wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(0, wxT("Time"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(1, wxT("Host"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(2, wxT("Platform"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(3, wxT("Executable"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(4, wxT("Status"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(5, wxT("Size"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(6, wxT("Download"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(7, wxT("Elapsed"), wxLIST_FORMAT_LEFT, 60);
+ m_listCtrl->InsertColumn(8, wxT("Execution"), wxLIST_FORMAT_LEFT, 60);
wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/sectiondlg.cpp host-tools/host/tools/configtool/standalone/wxwin/sectiondlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/sectiondlg.cpp 2001-06-02 00:16:30.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/sectiondlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -125,16 +125,16 @@
wxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
- wxButton *okButton = new wxButton( this, wxID_OK, "&OK", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *okButton = new wxButton( this, wxID_OK, wxT("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( okButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *cancelButton = new wxButton( this, wxID_CANCEL, "&Cancel", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *cancelButton = new wxButton( this, wxID_CANCEL, wxT("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( cancelButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *applyButton = new wxButton( this, wxID_APPLY, "&Apply", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *applyButton = new wxButton( this, wxID_APPLY, wxT("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( applyButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *helpButton = new wxButton( this, wxID_HELP, "&Help", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *helpButton = new wxButton( this, wxID_HELP, wxT("&Help"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( helpButton, 0, wxALIGN_CENTRE|wxALL, 5 );
#ifdef __WXGTK__
@@ -265,15 +265,15 @@
{
wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
- wxStaticBox *item2 = new wxStaticBox( parent, -1, "Name" );
+ wxStaticBox *item2 = new wxStaticBox( parent, -1, wxT("Name") );
wxSizer *item1 = new wxStaticBoxSizer( item2, wxHORIZONTAL );
wxSizer *item3 = new wxBoxSizer( wxVERTICAL );
- wxRadioButton *item4 = new wxRadioButton( parent, ecID_SECTION_GENERAL_LINKER, "&Linker-defined:", wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ wxRadioButton *item4 = new wxRadioButton( parent, ecID_SECTION_GENERAL_LINKER, wxT("&Linker-defined:"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- wxRadioButton *item5 = new wxRadioButton( parent, ecID_SECTION_GENERAL_USER, "&User-defined:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxRadioButton *item5 = new wxRadioButton( parent, ecID_SECTION_GENERAL_USER, wxT("&User-defined:"), wxDefaultPosition, wxDefaultSize, 0 );
item3->Add( item5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
item1->Add( item3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
@@ -282,24 +282,24 @@
wxSizer *item6 = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *item7 = new wxTextCtrl( parent, ecID_SECTION_GENERAL_LINKER_TEXT, "", wxDefaultPosition, wxSize(200,-1), 0 );
+ wxTextCtrl *item7 = new wxTextCtrl( parent, ecID_SECTION_GENERAL_LINKER_TEXT, wxT(""), wxDefaultPosition, wxSize(200,-1), 0 );
item6->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString strs8[] =
{
- "ChoiceItem"
+ wxT("ChoiceItem")
};
wxChoice *item8 = new wxChoice( parent, ecID_SECTION_GENERAL_USER_TEXT, wxDefaultPosition, wxSize(100,-1), 1, strs8, 0 );
item6->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
wxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
- wxCheckBox *item10 = new wxCheckBox( parent, ecID_SECTION_GENERAL_KNOWN_SIZE, "&Known size:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item10 = new wxCheckBox( parent, ecID_SECTION_GENERAL_KNOWN_SIZE, wxT("&Known size:"), wxDefaultPosition, wxDefaultSize, 0 );
item9->Add( item10, 0, wxALIGN_CENTRE|wxALL, 5 );
wxString strs11[] =
{
- "ChoiceItem"
+ wxT("ChoiceItem")
};
wxChoice *item11 = new wxChoice( parent, ecID_SECTION_GENERAL_KNOWN_SIZE_CHOICE, wxDefaultPosition, wxSize(100,-1), 1, strs11, 0 );
item9->Add( item11, 0, wxALIGN_CENTRE|wxALL, 5 );
@@ -313,15 +313,15 @@
//item0->Add( 20, 20, 0, wxALIGN_CENTRE|wxALL, 5 );
item0->Add( 1, 1, 20, wxALIGN_CENTRE|wxALL, 0 );
- wxStaticBox *item13 = new wxStaticBox( parent, -1, "Find Location (VMA)" );
+ wxStaticBox *item13 = new wxStaticBox( parent, -1, wxT("Find Location (VMA)") );
wxSizer *item12 = new wxStaticBoxSizer( item13, wxHORIZONTAL );
wxSizer *item14 = new wxBoxSizer( wxVERTICAL );
- wxRadioButton *item15 = new wxRadioButton( parent, ecID_SECTION_GENERAL_ABSOLUTE, "A&bsolute:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxRadioButton *item15 = new wxRadioButton( parent, ecID_SECTION_GENERAL_ABSOLUTE, wxT("A&bsolute:"), wxDefaultPosition, wxDefaultSize, 0 );
item14->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- wxRadioButton *item16 = new wxRadioButton( parent, ecID_SECTION_GENERAL_FOLLOWING, "&Following:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxRadioButton *item16 = new wxRadioButton( parent, ecID_SECTION_GENERAL_FOLLOWING, wxT("&Following:"), wxDefaultPosition, wxDefaultSize, 0 );
item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
item12->Add( item14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
@@ -330,24 +330,24 @@
wxSizer *item17 = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *item18 = new wxTextCtrl( parent, ecID_SECTION_GENERAL_ABSOLUTE_TEXT, "", wxDefaultPosition, wxSize(200,-1), 0 );
+ wxTextCtrl *item18 = new wxTextCtrl( parent, ecID_SECTION_GENERAL_ABSOLUTE_TEXT, wxT(""), wxDefaultPosition, wxSize(200,-1), 0 );
item17->Add( item18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxString strs19[] =
{
- "ChoiceItem"
+ wxT("ChoiceItem")
};
wxChoice *item19 = new wxChoice( parent, ecID_SECTION_GENERAL_FOLLOWING_TEXT, wxDefaultPosition, wxSize(100,-1), 1, strs19, 0 );
item17->Add( item19, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
wxSizer *item20 = new wxBoxSizer( wxHORIZONTAL );
- wxStaticText *item21 = new wxStaticText( parent, wxID_STATIC, "&Alignment:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText *item21 = new wxStaticText( parent, wxID_STATIC, wxT("&Alignment:"), wxDefaultPosition, wxDefaultSize, 0 );
item20->Add( item21, 0, wxALIGN_CENTRE|wxALL, 5 );
wxString strs22[] =
{
- "ChoiceItem"
+ wxT("ChoiceItem")
};
wxChoice *item22 = new wxChoice( parent, ecID_SECTION_GENERAL_ALIGNMENT, wxDefaultPosition, wxSize(100,-1), 1, strs22, 0 );
item20->Add( item22, 0, wxALIGN_CENTRE|wxALL, 5 );
@@ -397,36 +397,36 @@
item0->Add( 20, 20, 5, wxALIGN_CENTRE|wxALL, 5 );
- wxCheckBox *item1 = new wxCheckBox( parent, ecID_SECTION_RELOCATION_RELOCATE, "&Relocate section", wxDefaultPosition, wxDefaultSize, 0 );
+ wxCheckBox *item1 = new wxCheckBox( parent, ecID_SECTION_RELOCATION_RELOCATE, wxT("&Relocate section"), wxDefaultPosition, wxDefaultSize, 0 );
item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
item0->Add( 20, 20, 20, wxALIGN_CENTRE|wxALL, 0 );
- wxStaticBox *item3 = new wxStaticBox( parent, -1, "Initial Location (LMA)" );
+ wxStaticBox *item3 = new wxStaticBox( parent, -1, wxT("Initial Location (LMA)") );
wxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
wxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
- wxRadioButton *item5 = new wxRadioButton( parent, ecID_SECTION_RELOCATION_ABSOLUTE, "A&bsolute:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxRadioButton *item5 = new wxRadioButton( parent, ecID_SECTION_RELOCATION_ABSOLUTE, wxT("A&bsolute:"), wxDefaultPosition, wxDefaultSize, 0 );
item4->Add( item5, 0, wxALIGN_CENTRE|wxALL, 5 );
item4->Add( 20, 20, 1, wxALIGN_CENTRE|wxALL, 5 );
- wxTextCtrl *item6 = new wxTextCtrl( parent, ecID_SECTION_RELOCATION_ABSOLUTE_TEXT, "", wxDefaultPosition, wxSize(80,-1), 0 );
+ wxTextCtrl *item6 = new wxTextCtrl( parent, ecID_SECTION_RELOCATION_ABSOLUTE_TEXT, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
item4->Add( item6, 20, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxSizer *item7 = new wxBoxSizer( wxHORIZONTAL );
- wxRadioButton *item8 = new wxRadioButton( parent, ecID_SECTION_RELOCATION_FOLLOWING, "&Following:", wxDefaultPosition, wxDefaultSize, 0 );
+ wxRadioButton *item8 = new wxRadioButton( parent, ecID_SECTION_RELOCATION_FOLLOWING, wxT("&Following:"), wxDefaultPosition, wxDefaultSize, 0 );
item7->Add( item8, 0, wxALIGN_CENTRE|wxALL, 5 );
item7->Add( 20, 20, 1, wxALIGN_CENTRE|wxALL, 5 );
wxString strs9[] =
{
- "ChoiceItem"
+ wxT("ChoiceItem")
};
wxChoice *item9 = new wxChoice( parent, ecID_SECTION_RELOCATION_FOLLOWING_CHOICE, wxDefaultPosition, wxSize(100,-1), 1, strs9, 0 );
item7->Add( item9, 20, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
@@ -473,7 +473,7 @@
{
wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
- wxTextCtrl *item1 = new wxTextCtrl( parent, ecID_SECTION_NOTE_TEXT, "", wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE );
+ wxTextCtrl *item1 = new wxTextCtrl( parent, ecID_SECTION_NOTE_TEXT, wxT(""), wxDefaultPosition, wxSize(80,40), wxTE_MULTILINE );
item0->Add( item1, 20, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/settingsdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/settingsdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/settingsdlg.cpp 2002-05-21 00:19:28.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/settingsdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -156,13 +156,13 @@
wxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
- wxButton *okButton = new wxButton( this, wxID_OK, "&OK", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *okButton = new wxButton( this, wxID_OK, wxT("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( okButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *cancelButton = new wxButton( this, wxID_CANCEL, "&Cancel", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *cancelButton = new wxButton( this, wxID_CANCEL, wxT("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( cancelButton, 0, wxALIGN_CENTRE|wxALL, 5 );
- wxButton *helpButton = new wxButton( this, wxID_HELP, "&Help", wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton *helpButton = new wxButton( this, wxID_HELP, wxT("&Help"), wxDefaultPosition, wxDefaultSize, 0 );
item1->Add( helpButton, 0, wxALIGN_CENTRE|wxALL, 5 );
#ifdef __WXGTK__
@@ -973,7 +973,7 @@
break;
}
- m_baudString.Printf("%d", wxGetApp().GetSettings().GetRunTestsSettings().m_nBaud);
+ m_baudString.Printf(wxT("%d"), wxGetApp().GetSettings().GetRunTestsSettings().m_nBaud);
wxPanel::TransferDataToWindow();
@@ -1037,7 +1037,7 @@
wxChoice *item8 = new wxChoice( parent, ecID_RUN_PROPERTIES_DOWNLOAD_CHOICE, wxDefaultPosition, wxSize(100,-1), 3, strs8, 0 );
item6->Add( item8, 1, wxALIGN_CENTRE|wxALL, 5 );
- wxSpinCtrl *item9 = new wxSpinCtrl( parent, ecID_RUN_PROPERTIES_DOWNLOAD_TIMEOUT, "0", wxDefaultPosition, wxSize(50,-1), 0, 0, 10000, 0 );
+ wxSpinCtrl *item9 = new wxSpinCtrl( parent, ecID_RUN_PROPERTIES_DOWNLOAD_TIMEOUT, wxT("0"), wxDefaultPosition, wxSize(50,-1), 0, 0, 10000, 0 );
item6->Add( item9, 0, wxALIGN_CENTRE|wxALL, 5 );
item4->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
@@ -1056,7 +1056,7 @@
wxChoice *item12 = new wxChoice( parent, ecID_RUN_PROPERTIES_RUNTIME_CHOICE, wxDefaultPosition, wxSize(100,-1), 3, strs12, 0 );
item10->Add( item12, 1, wxALIGN_CENTRE|wxALL, 5 );
- wxSpinCtrl *item13 = new wxSpinCtrl( parent, ecID_RUN_PROPERTIES_RUNTIME_TIMEOUT, "0", wxDefaultPosition, wxSize(50,-1), 0, 0, 10000, 0 );
+ wxSpinCtrl *item13 = new wxSpinCtrl( parent, ecID_RUN_PROPERTIES_RUNTIME_TIMEOUT, wxT("0"), wxDefaultPosition, wxSize(50,-1), 0, 0, 10000, 0 );
item10->Add( item13, 0, wxALIGN_CENTRE|wxALL, 5 );
item4->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/symbols.h host-tools/host/tools/configtool/standalone/wxwin/symbols.h
--- ecos/host/tools/configtool/standalone/wxwin/symbols.h 2003-03-31 20:11:01.000000000 +0200
+++ host-tools/host/tools/configtool/standalone/wxwin/symbols.h 2007-10-28 23:39:37.000000000 +0100
@@ -44,7 +44,7 @@
//
//===========================================================================
-#define ecCONFIGURATION_TOOL_VERSION "2.net"
+#define ecCONFIGURATION_TOOL_VERSION wxT("2.net")
// Use /ecos-x notation for drive specification
#define ecUSE_ECOS_X_NOTATION 1
diff -U 3 -H -d -r -N -- ecos/host/tools/configtool/standalone/wxwin/templatesdlg.cpp host-tools/host/tools/configtool/standalone/wxwin/templatesdlg.cpp
--- ecos/host/tools/configtool/standalone/wxwin/templatesdlg.cpp 2001-12-07 15:15:04.000000000 +0100
+++ host-tools/host/tools/configtool/standalone/wxwin/templatesdlg.cpp 2007-10-28 23:39:37.000000000 +0100
@@ -107,7 +107,7 @@
wxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
wxString *strs3 = (wxString*) NULL;
- wxComboBox *item3 = new wxComboBox( parent, ecID_TEMPLATES_DIALOG_HARDWARE_TEMPLATES, "", wxDefaultPosition, wxSize(360,-1), 0, strs3, wxCB_DROPDOWN|wxCB_READONLY|wxCB_SORT );
+ wxComboBox *item3 = new wxComboBox( parent, ecID_TEMPLATES_DIALOG_HARDWARE_TEMPLATES, wxT(""), wxDefaultPosition, wxSize(360,-1), 0, strs3, wxCB_DROPDOWN|wxCB_READONLY|wxCB_SORT );
item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxTextCtrl *item4 = new wxTextCtrl( parent, ecID_TEMPLATES_DIALOG_HARDWARE_DESCRIPTION, _(""), wxDefaultPosition, wxSize(90,60), wxTE_MULTILINE|wxTE_READONLY );
@@ -349,13 +349,13 @@
{
GetSizer()->Add( win2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
GetSizer()->Add( win1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- button->SetLabel("&Details <<");
+ button->SetLabel(wxT("&Details <<"));
}
else
{
GetSizer()->Remove(win1);
GetSizer()->Remove(win2);
- button->SetLabel("&Details >>");
+ button->SetLabel(wxT("&Details >>"));
}
win1->Show(show);
win2->Show(show);
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-03-26 13:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-05 10:34 configtool wxT patch John Dallaway
2007-11-05 12:29 ` Lars Poeschel
2008-03-26 12:43 ` Lars Poeschel
2008-03-26 13:00 ` John Dallaway
-- strict thread matches above, loose matches on Subject: below --
2007-10-29 21:24 Lars Poeschel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).