Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxrc-generated c++ code to work in Unicode mode (patch #704064)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-03-16 20:27:15 +00:00
parent cc3da3f8a1
commit 5851504dfc
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/utils/wxrc/wxrc.cpp
View File

@@ -370,7 +370,7 @@ static wxString FileToCppArray(wxString filename, int num)
wxString output; wxString output;
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, "rb"); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); size_t lng = file.Length();
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
@@ -405,7 +405,7 @@ static wxString FileToCppArray(wxString filename, int num)
void XmlResApp::MakePackageCPP(const wxArrayString& flist) void XmlResApp::MakePackageCPP(const wxArrayString& flist)
{ {
wxFFile file(parOutput, "wt"); wxFFile file(parOutput, wxT("wt"));
size_t i; size_t i;
if (flagVerbose) if (flagVerbose)
@@ -436,15 +436,15 @@ _T("\n"));
FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
file.Write(_T("") file.Write(_T("")
_T("void " + parFuncname + "()\n") _T("void ") + parFuncname + wxT("()\n")
_T("{\n") _T("{\n")
_T("\n") _T("\n")
_T(" // Check for memory FS. If not present, load the handler:\n") _T(" // Check for memory FS. If not present, load the handler:\n")
_T(" {\n") _T(" {\n")
_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n") _T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
_T(" wxFileSystem fsys;\n") _T(" wxFileSystem fsys;\n")
_T(" wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n") _T(" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n")
_T(" wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n") _T(" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n")
_T(" if (f) delete f;\n") _T(" if (f) delete f;\n")
_T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n") _T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n")
_T(" }\n") _T(" }\n")
@@ -453,15 +453,15 @@ _T("\n"));
for (i = 0; i < flist.Count(); i++) for (i = 0; i < flist.Count(); i++)
{ {
wxString s; wxString s;
s.Printf(_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/") + flist[i] + s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
_T("\", xml_res_file_%i, xml_res_size_%i);\n"), i, i); _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i);
file.Write(s); file.Write(s);
} }
for (i = 0; i < parFiles.Count(); i++) for (i = 0; i < parFiles.Count(); i++)
{ {
file.Write(_T(" wxXmlResource::Get()->Load(\"memory:XRC_resource/") + file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
GetInternalFileName(parFiles[i], flist) + _T("\");\n")); GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
} }
file.Write(_T("}\n")); file.Write(_T("}\n"));
@@ -474,7 +474,7 @@ static wxString FileToPythonArray(wxString filename, int num)
wxString output; wxString output;
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, "rb"); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); size_t lng = file.Length();
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
@@ -516,7 +516,7 @@ static wxString FileToPythonArray(wxString filename, int num)
void XmlResApp::MakePackagePython(const wxArrayString& flist) void XmlResApp::MakePackagePython(const wxArrayString& flist)
{ {
wxFFile file(parOutput, "wt"); wxFFile file(parOutput, wxT("wt"));
size_t i; size_t i;
if (flagVerbose) if (flagVerbose)
@@ -553,7 +553,7 @@ void XmlResApp::OutputGettext()
wxFFile fout; wxFFile fout;
if (!parOutput) fout.Attach(stdout); if (!parOutput) fout.Attach(stdout);
else fout.Open(parOutput, "wt"); else fout.Open(parOutput, wxT("wt"));
for (size_t i = 0; i < str.GetCount(); i++) for (size_t i = 0; i < str.GetCount(); i++)
fout.Write(_T("_(\"") + str[i] + _T("\");\n")); fout.Write(_T("_(\"") + str[i] + _T("\");\n"));

26
utils/wxrc/wxrc.cpp
View File

@@ -370,7 +370,7 @@ static wxString FileToCppArray(wxString filename, int num)
wxString output; wxString output;
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, "rb"); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); size_t lng = file.Length();
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
@@ -405,7 +405,7 @@ static wxString FileToCppArray(wxString filename, int num)
void XmlResApp::MakePackageCPP(const wxArrayString& flist) void XmlResApp::MakePackageCPP(const wxArrayString& flist)
{ {
wxFFile file(parOutput, "wt"); wxFFile file(parOutput, wxT("wt"));
size_t i; size_t i;
if (flagVerbose) if (flagVerbose)
@@ -436,15 +436,15 @@ _T("\n"));
FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i)); FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
file.Write(_T("") file.Write(_T("")
_T("void " + parFuncname + "()\n") _T("void ") + parFuncname + wxT("()\n")
_T("{\n") _T("{\n")
_T("\n") _T("\n")
_T(" // Check for memory FS. If not present, load the handler:\n") _T(" // Check for memory FS. If not present, load the handler:\n")
_T(" {\n") _T(" {\n")
_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n") _T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
_T(" wxFileSystem fsys;\n") _T(" wxFileSystem fsys;\n")
_T(" wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n") _T(" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n")
_T(" wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n") _T(" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n")
_T(" if (f) delete f;\n") _T(" if (f) delete f;\n")
_T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n") _T(" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n")
_T(" }\n") _T(" }\n")
@@ -453,15 +453,15 @@ _T("\n"));
for (i = 0; i < flist.Count(); i++) for (i = 0; i < flist.Count(); i++)
{ {
wxString s; wxString s;
s.Printf(_T(" wxMemoryFSHandler::AddFile(\"XRC_resource/") + flist[i] + s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
_T("\", xml_res_file_%i, xml_res_size_%i);\n"), i, i); _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i);
file.Write(s); file.Write(s);
} }
for (i = 0; i < parFiles.Count(); i++) for (i = 0; i < parFiles.Count(); i++)
{ {
file.Write(_T(" wxXmlResource::Get()->Load(\"memory:XRC_resource/") + file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
GetInternalFileName(parFiles[i], flist) + _T("\");\n")); GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
} }
file.Write(_T("}\n")); file.Write(_T("}\n"));
@@ -474,7 +474,7 @@ static wxString FileToPythonArray(wxString filename, int num)
wxString output; wxString output;
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, "rb"); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); size_t lng = file.Length();
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
@@ -516,7 +516,7 @@ static wxString FileToPythonArray(wxString filename, int num)
void XmlResApp::MakePackagePython(const wxArrayString& flist) void XmlResApp::MakePackagePython(const wxArrayString& flist)
{ {
wxFFile file(parOutput, "wt"); wxFFile file(parOutput, wxT("wt"));
size_t i; size_t i;
if (flagVerbose) if (flagVerbose)
@@ -553,7 +553,7 @@ void XmlResApp::OutputGettext()
wxFFile fout; wxFFile fout;
if (!parOutput) fout.Attach(stdout); if (!parOutput) fout.Attach(stdout);
else fout.Open(parOutput, "wt"); else fout.Open(parOutput, wxT("wt"));
for (size_t i = 0; i < str.GetCount(); i++) for (size_t i = 0; i < str.GetCount(); i++)
fout.Write(_T("_(\"") + str[i] + _T("\");\n")); fout.Write(_T("_(\"") + str[i] + _T("\");\n"));