From: Václav Slavík Date: Sat, 3 Jul 2010 14:24:27 +0000 (+0000) Subject: Fix strings formatting in wxrc. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b1aeed1bbd55c942e7ebe1f7e02877a1ea6e25e Fix strings formatting in wxrc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 853359afba..9a309dbf5e 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -586,7 +586,7 @@ static wxString FileToCppArray(wxString filename, int num) wxT("Huge file not supported") ); 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"); // we cannot use string literals because MSVC is dumb wannabe compiler // with arbitrary limitation to 2048 strings :( @@ -618,7 +618,7 @@ static wxString FileToCppArray(wxString filename, int num) void XmlResApp::MakePackageCPP(const wxArrayString& flist) { wxFFile file(parOutput, wxT("wt")); - size_t i; + unsigned i; if (flagVerbose) wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n")); @@ -688,7 +688,7 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist) #endif // wxUSE_MIMETYPE 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()); file.Write(s); } @@ -779,7 +779,7 @@ static wxString FileToPythonArray(wxString filename, int num) void XmlResApp::MakePackagePython(const wxArrayString& flist) { wxFFile file(parOutput, wxT("wt")); - size_t i; + unsigned i; if (flagVerbose) wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n")); @@ -818,7 +818,7 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) { wxString s; s.Printf(" wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] + - "', xml_res_file_%i)\n", i); + "', xml_res_file_%u)\n", i); file.Write(s); } for (i = 0; i < parFiles.GetCount(); i++)