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

Fix strings formatting in wxrc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-07-03 14:24:27 +00:00
parent b113edcdd7
commit 9b1aeed1bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/wxrc/wxrc.cpp
View File

@@ -586,7 +586,7 @@ static wxString FileToCppArray(wxString filename, int num)
wxT("Huge file not supported") ); wxT("Huge file not supported") );
snum.Printf(wxT("%i"), num); snum.Printf(wxT("%i"), num);
output.Printf(wxT("static size_t xml_res_size_") + snum + wxT(" = %i;\n"), lng); output.Printf(wxT("static size_t xml_res_size_") + snum + wxT(" = %zu;\n"), lng);
output += wxT("static unsigned char xml_res_file_") + snum + wxT("[] = {\n"); output += wxT("static unsigned char xml_res_file_") + snum + wxT("[] = {\n");
// we cannot use string literals because MSVC is dumb wannabe compiler // we cannot use string literals because MSVC is dumb wannabe compiler
// with arbitrary limitation to 2048 strings :( // with arbitrary limitation to 2048 strings :(
@@ -618,7 +618,7 @@ static wxString FileToCppArray(wxString filename, int num)
void XmlResApp::MakePackageCPP(const wxArrayString& flist) void XmlResApp::MakePackageCPP(const wxArrayString& flist)
{ {
wxFFile file(parOutput, wxT("wt")); wxFFile file(parOutput, wxT("wt"));
size_t i; unsigned i;
if (flagVerbose) if (flagVerbose)
wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n")); wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
@@ -688,7 +688,7 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
#endif // wxUSE_MIMETYPE #endif // wxUSE_MIMETYPE
s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] + s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] +
"\"), xml_res_file_%i, xml_res_size_%i, wxT(\"%s\"));\n", "\"), xml_res_file_%u, xml_res_size_%u, wxT(\"%s\"));\n",
i, i, mime.c_str()); i, i, mime.c_str());
file.Write(s); file.Write(s);
} }
@@ -779,7 +779,7 @@ static wxString FileToPythonArray(wxString filename, int num)
void XmlResApp::MakePackagePython(const wxArrayString& flist) void XmlResApp::MakePackagePython(const wxArrayString& flist)
{ {
wxFFile file(parOutput, wxT("wt")); wxFFile file(parOutput, wxT("wt"));
size_t i; unsigned i;
if (flagVerbose) if (flagVerbose)
wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n")); wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
@@ -818,7 +818,7 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
{ {
wxString s; wxString s;
s.Printf(" wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] + s.Printf(" wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] +
"', xml_res_file_%i)\n", i); "', xml_res_file_%u)\n", i);
file.Write(s); file.Write(s);
} }
for (i = 0; i < parFiles.GetCount(); i++) for (i = 0; i < parFiles.GetCount(); i++)