solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'use-template-for-vararg-funcs'

Browse source 
Use variadic templates for implementing the vararg functions.

See #22981.
This commit is contained in:
Vadim Zeitlin 2022-11-26 16:53:41 +01:00
commit d0af75e88d
18 changed files with 395 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

12
utils/wxrc/wxrc.cpp
View file

@ -417,7 +417,7 @@ wxArrayString XmlResApp::PrepareTempFiles()
for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
wxPrintf(wxT("processing %s...\n"), parFiles[i]);
wxXmlDocument doc;
@ -529,7 +529,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
if (flagVerbose)
wxPrintf(wxT("adding ") + fullname + wxT("...\n"));
wxPrintf(wxT("adding %s...\n"), fullname);
wxString filename = GetInternalFileName(n->GetContent(), flist);
n->SetContent(filename);
@ -569,7 +569,7 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
files.RemoveLast();
if (flagVerbose)
wxPrintf(wxT("compressing ") + parOutput + wxT("...\n"));
wxPrintf(wxT("compressing %s...\n"), parOutput);
wxString cwd = wxGetCwd();
wxSetWorkingDirectory(parOutputPath);
@ -639,7 +639,7 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
unsigned i;
if (flagVerbose)
wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
wxPrintf(wxT("creating C++ source file %s...\n"), parOutput);
file.Write(""
"//\n"
@ -797,7 +797,7 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
unsigned i;
if (flagVerbose)
wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
wxPrintf(wxT("creating Python source file %s...\n"), parOutput);
file.Write(
"#\n"
@ -881,7 +881,7 @@ ExtractedStrings XmlResApp::FindStrings()
for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
wxPrintf(wxT("processing %s...\n"), parFiles[i]);
wxXmlDocument doc;
if (!doc.Load(parFiles[i]))