#include "wx/utils.h"
#include "wx/hashset.h"
#include "wx/mimetype.h"
+#include "wx/vector.h"
WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet);
wxXmlNode* children;
while (node)
{
- if (node->GetName() == _T("object")
- && node->GetPropVal(_T("class"),&classValue)
- && node->GetPropVal(_T("name"),&nameValue))
+ if (node->GetName() == wxT("object")
+ && node->GetAttribute(wxT("class"),&classValue)
+ && node->GetAttribute(wxT("name"),&nameValue))
{
m_wdata.Add(XRCWidgetData(nameValue,classValue));
}
const wxXmlNode* node) :
m_className(className) , m_parentClassName(parentClassName)
{
- if ( className == _T("wxMenu") )
+ if ( className == wxT("wxMenu") )
{
- m_ancestorClassNames.insert(_T("wxMenu"));
- m_ancestorClassNames.insert(_T("wxMenuBar"));
+ m_ancestorClassNames.insert(wxT("wxMenu"));
+ m_ancestorClassNames.insert(wxT("wxMenuBar"));
}
- else if ( className == _T("wxMDIChildFrame") )
+ else if ( className == wxT("wxMDIChildFrame") )
{
- m_ancestorClassNames.insert(_T("wxMDIParentFrame"));
+ m_ancestorClassNames.insert(wxT("wxMDIParentFrame"));
}
- else if( className == _T("wxMenuBar") ||
- className == _T("wxStatusBar") ||
- className == _T("wxToolBar") )
+ else if( className == wxT("wxMenuBar") ||
+ className == wxT("wxStatusBar") ||
+ className == wxT("wxToolBar") )
{
- m_ancestorClassNames.insert(_T("wxFrame"));
+ m_ancestorClassNames.insert(wxT("wxFrame"));
}
else
{
- m_ancestorClassNames.insert(_T("wxWindow"));
+ m_ancestorClassNames.insert(wxT("wxWindow"));
}
BrowseXmlNode(node->GetChildren());
bool CanBeUsedWithXRCCTRL(const wxString& name)
{
- if (name == _T("tool") ||
- name == _T("data") ||
- name == _T("unknown") ||
- name == _T("notebookpage") ||
- name == _T("separator") ||
- name == _T("sizeritem") ||
- name == _T("wxMenuBar") ||
- name == _T("wxMenuItem") ||
- name == _T("wxStaticBoxSizer") )
+ if (name == wxT("tool") ||
+ name == wxT("data") ||
+ name == wxT("unknown") ||
+ name == wxT("notebookpage") ||
+ name == wxT("separator") ||
+ name == wxT("sizeritem") ||
+ name == wxT("wxMenu") ||
+ name == wxT("wxMenuBar") ||
+ name == wxT("wxMenuItem") ||
+ name.EndsWith(wxT("Sizer")) )
{
return false;
}
void GenerateHeaderCode(wxFFile& file)
{
- file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
- + _T(" {\nprotected:\n"));
+ file.Write(wxT("class ") + m_className + wxT(" : public ") + m_parentClassName
+ + wxT(" {\nprotected:\n"));
size_t i;
for(i=0;i<m_wdata.GetCount();++i)
{
if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue;
file.Write(
- _T(" ") + w.GetClass() + _T("* ") + w.GetName()
- + _T(";\n"));
+ wxT(" ") + w.GetClass() + wxT("* ") + w.GetName()
+ + wxT(";\n"));
}
- file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n")
- _T(" wxXmlResource::Get()->LoadObject(this,parent,_T(\"")
+ file.Write(wxT("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n")
+ wxT(" wxXmlResource::Get()->LoadObject(this,parent,wxT(\"")
+ m_className
- + _T("\"), _T(\"")
+ + wxT("\"), wxT(\"")
+ m_parentClassName
- + _T("\"));\n"));
+ + wxT("\"));\n"));
for(i=0;i<m_wdata.GetCount();++i)
{
const XRCWidgetData& w = m_wdata.Item(i);
if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue;
- file.Write( _T(" ")
+ file.Write( wxT(" ")
+ w.GetName()
- + _T(" = XRCCTRL(*this,\"")
+ + wxT(" = XRCCTRL(*this,\"")
+ w.GetName()
- + _T("\",")
+ + wxT("\",")
+ w.GetClass()
- + _T(");\n"));
+ + wxT(");\n"));
}
- file.Write(_T(" }\n"));
+ file.Write(wxT(" }\n"));
- file.Write( _T("public:\n"));
+ file.Write( wxT("public:\n"));
if ( m_ancestorClassNames.size() == 1 )
{
file.Write
(
m_className +
- _T("(") +
+ wxT("(") +
*m_ancestorClassNames.begin() +
- _T(" *parent=NULL){\n") +
- _T(" InitWidgetsFromXRC((wxWindow *)parent);\n")
- _T(" }\n")
- _T("};\n")
+ wxT(" *parent=NULL){\n") +
+ wxT(" InitWidgetsFromXRC((wxWindow *)parent);\n")
+ wxT(" }\n")
+ wxT("};\n")
);
}
else
{
- file.Write(m_className + _T("(){\n") +
- _T(" InitWidgetsFromXRC(NULL);\n")
- _T(" }\n")
- _T("};\n"));
+ file.Write(m_className + wxT("(){\n") +
+ wxT(" InitWidgetsFromXRC(NULL);\n")
+ wxT(" }\n")
+ wxT("};\n"));
for ( StringSet::const_iterator it = m_ancestorClassNames.begin();
it != m_ancestorClassNames.end();
++it )
{
- file.Write(m_className + _T("(") + *it + _T(" *parent){\n") +
- _T(" InitWidgetsFromXRC((wxWindow *)parent);\n")
- _T(" }\n")
- _T("};\n"));
+ file.Write(m_className + wxT("(") + *it + wxT(" *parent){\n") +
+ wxT(" InitWidgetsFromXRC((wxWindow *)parent);\n")
+ wxT(" }\n")
+ wxT("};\n"));
}
}
}
WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData)
+struct ExtractedString
+{
+ ExtractedString() : lineNo(-1) {}
+ ExtractedString(const wxString& str_,
+ const wxString& filename_, int lineNo_)
+ : str(str_), filename(filename_), lineNo(lineNo_)
+ {}
+
+ wxString str;
+
+ wxString filename;
+ int lineNo;
+};
+
+typedef wxVector<ExtractedString> ExtractedStrings;
+
class XmlResApp : public wxAppConsole
{
void MakePackagePython(const wxArrayString& flist);
void OutputGettext();
- wxArrayString FindStrings();
- wxArrayString FindStrings(wxXmlNode *node);
+ ExtractedStrings FindStrings();
+ ExtractedStrings FindStrings(const wxString& filename, wxXmlNode *node);
bool flagVerbose, flagCPP, flagPython, flagGettext;
wxString parOutput, parFuncname, parOutputPath;
{
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
- { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show help message"),
- wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
- { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"), _T("output C++ header file with XRC derived classes"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"), _T("output C++ source rather than .rsc file"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"), _T("output wxPython source rather than .rsc file"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"), _T("output list of translatable strings (to stdout or file if -o used)"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]"), (wxCmdLineParamType)0, 0 },
- { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]"), (wxCmdLineParamType)0, 0 },
+ { wxCMD_LINE_SWITCH, "h", "help", "show help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+ { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
+ { wxCMD_LINE_SWITCH, "e", "extra-cpp-code", "output C++ header file with XRC derived classes" },
+ { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" },
+ { wxCMD_LINE_SWITCH, "p", "python-code", "output wxPython source rather than .rsc file" },
+ { wxCMD_LINE_SWITCH, "g", "gettext", "output list of translatable strings (to stdout or file if -o used)" },
+ { wxCMD_LINE_OPTION, "n", "function", "C++/Python function name (with -c or -p) [InitXmlResource]" },
+ { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" },
#if 0 // not yet implemented
- { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of necessary handlers to this file"), (wxCmdLineParamType)0, 0 },
+ { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of necessary handlers to this file" },
#endif
- { wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"),
+ { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)",
wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
- { wxCMD_LINE_NONE, NULL, NULL, NULL, (wxCmdLineParamType)0, 0 }
+ wxCMD_LINE_DESC_END
};
wxCmdLineParser parser(cmdLineDesc, argc, argv);
void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
{
- flagGettext = cmdline.Found(_T("g"));
- flagVerbose = cmdline.Found(_T("v"));
- flagCPP = cmdline.Found(_T("c"));
- flagPython = cmdline.Found(_T("p"));
- flagH = flagCPP && cmdline.Found(_T("e"));
+ flagGettext = cmdline.Found("g");
+ flagVerbose = cmdline.Found("v");
+ flagCPP = cmdline.Found("c");
+ flagPython = cmdline.Found("p");
+ flagH = flagCPP && cmdline.Found("e");
- if (!cmdline.Found(_T("o"), &parOutput))
+ if (!cmdline.Found("o", &parOutput))
{
if (flagGettext)
parOutput = wxEmptyString;
else
{
if (flagCPP)
- parOutput = _T("resource.cpp");
+ parOutput = wxT("resource.cpp");
else if (flagPython)
- parOutput = _T("resource.py");
+ parOutput = wxT("resource.py");
else
- parOutput = _T("resource.xrs");
+ parOutput = wxT("resource.xrs");
}
}
if (!parOutput.empty())
parOutput = fn.GetFullPath();
parOutputPath = wxPathOnly(parOutput);
}
- if (!parOutputPath) parOutputPath = _T(".");
+ if (!parOutputPath) parOutputPath = wxT(".");
- if (!cmdline.Found(_T("n"), &parFuncname))
- parFuncname = _T("InitXmlResource");
+ if (!cmdline.Found("n", &parFuncname))
+ parFuncname = wxT("InitXmlResource");
for (size_t i = 0; i < cmdline.GetParamCount(); i++)
{
wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist)
{
wxString name2 = name;
- name2.Replace(_T(":"), _T("_"));
- name2.Replace(_T("/"), _T("_"));
- name2.Replace(_T("\\"), _T("_"));
- name2.Replace(_T("*"), _T("_"));
- name2.Replace(_T("?"), _T("_"));
+ name2.Replace(wxT(":"), wxT("_"));
+ name2.Replace(wxT("/"), wxT("_"));
+ name2.Replace(wxT("\\"), wxT("_"));
+ name2.Replace(wxT("*"), wxT("_"));
+ name2.Replace(wxT("?"), wxT("_"));
- wxString s = wxFileNameFromPath(parOutput) + _T("$") + name2;
+ wxString s = wxFileNameFromPath(parOutput) + wxT("$") + name2;
if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND)
{
for (int i = 0;; i++)
{
- s.Printf(wxFileNameFromPath(parOutput) + _T("$%03i-") + name2, i);
+ s.Printf(wxFileNameFromPath(parOutput) + wxT("$%03i-") + name2, i);
if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND)
break;
}
for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
- wxPrintf(_T("processing ") + parFiles[i] + _T("...\n"));
+ wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
wxXmlDocument doc;
if (!doc.Load(parFiles[i]))
{
- wxLogError(_T("Error parsing file ") + parFiles[i]);
+ wxLogError(wxT("Error parsing file ") + parFiles[i]);
retCode = 1;
continue;
}
wxString name, ext, path;
- wxSplitPath(parFiles[i], &path, &name, &ext);
+ wxFileName::SplitPath(parFiles[i], &path, &name, &ext);
FindFilesInXML(doc.GetRoot(), flist, path);
if (flagH)
wxXmlNode* node = (doc.GetRoot())->GetChildren();
wxString classValue,nameValue;
while(node){
- if(node->GetName() == _T("object")
- && node->GetPropVal(_T("class"),&classValue)
- && node->GetPropVal(_T("name"),&nameValue)){
+ if(node->GetName() == wxT("object")
+ && node->GetAttribute(wxT("class"),&classValue)
+ && node->GetAttribute(wxT("name"),&nameValue)){
aXRCWndClassData.Add(
XRCWndClassData(nameValue,classValue,node)
const wxString name = node->GetName();
// Any bitmaps (bitmap2 is used for disabled toolbar buttons):
- if ( name == _T("bitmap") || name == _T("bitmap2") )
+ if ( name == wxT("bitmap") || name == wxT("bitmap2") )
return true;
- if ( name == _T("icon") )
- return true;
-
- // URLs in wxHtmlWindow:
- if ( name == _T("url") )
+ if ( name == wxT("icon") )
return true;
// wxBitmapButton:
wxXmlNode *parent = node->GetParent();
if (parent != NULL &&
- parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
- (name == _T("focus") ||
- name == _T("disabled") ||
- name == _T("selected")))
+ parent->GetAttribute(wxT("class"), wxT("")) == wxT("wxBitmapButton") &&
+ (name == wxT("focus") ||
+ name == wxT("disabled") ||
+ name == wxT("hover") ||
+ name == wxT("selected")))
return true;
// wxBitmap or wxIcon toplevel resources:
- if ( name == _T("object") )
+ if ( name == wxT("object") )
{
- wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
- if (klass == _T("wxBitmap") ||
- klass == _T("wxIcon") ||
- klass == _T("data") )
+ wxString klass = node->GetAttribute(wxT("class"), wxEmptyString);
+ if (klass == wxT("wxBitmap") ||
+ klass == wxT("wxIcon") ||
+ klass == wxT("data") )
return true;
}
+ // URLs in wxHtmlWindow:
+ if ( name == wxT("url") &&
+ parent != NULL &&
+ parent->GetAttribute(wxT("class"), wxT("")) == wxT("wxHtmlWindow") )
+ {
+ // FIXME: this is wrong for e.g. http:// URLs
+ return true;
+ }
+
return false;
}
fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
if (flagVerbose)
- wxPrintf(_T("adding ") + fullname + _T("...\n"));
+ wxPrintf(wxT("adding ") + fullname + wxT("...\n"));
wxString filename = GetInternalFileName(n->GetContent(), flist);
n->SetContent(filename);
wxString files;
for (size_t i = 0; i < flist.GetCount(); i++)
- files += flist[i] + _T(" ");
+ files += flist[i] + wxT(" ");
files.RemoveLast();
if (flagVerbose)
- wxPrintf(_T("compressing ") + parOutput + _T("...\n"));
+ wxPrintf(wxT("compressing ") + parOutput + wxT("...\n"));
wxString cwd = wxGetCwd();
wxSetWorkingDirectory(parOutputPath);
- int execres = wxExecute(_T("zip -9 -j ") +
- wxString(flagVerbose ? _T("\"") : _T("-q \"")) +
- parOutput + _T("\" ") + files, true);
+ int execres = wxExecute(wxT("zip -9 -j ") +
+ wxString(flagVerbose ? wxT("\"") : wxT("-q \"")) +
+ parOutput + wxT("\" ") + files, true);
wxSetWorkingDirectory(cwd);
if (execres == -1)
{
- wxLogError(_T("Unable to execute zip program. Make sure it is in the path."));
- wxLogError(_T("You can download it at http://www.cdrom.com/pub/infozip/"));
+ wxLogError(wxT("Unable to execute zip program. Make sure it is in the path."));
+ wxLogError(wxT("You can download it at http://www.cdrom.com/pub/infozip/"));
retCode = 1;
return;
}
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
const size_t lng = wx_truncate_cast(size_t, offset);
- wxASSERT_MSG( lng == offset, wxT("Huge file not supported") );
+ wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
+ wxT("Huge file not supported") );
- snum.Printf(_T("%i"), num);
- output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
- output += _T("static unsigned char xml_res_file_") + snum + _T("[] = {\n");
+ snum.Printf(wxT("%i"), num);
+ output.Printf(wxT("static size_t xml_res_size_") + snum + wxT(" = %lu;\n"),
+ static_cast<unsigned long>(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 :(
for (size_t i = 0, linelng = 0; i < lng; i++)
{
- tmp.Printf(_T("%i"), buffer[i]);
- if (i != 0) output << _T(',');
+ tmp.Printf(wxT("%i"), buffer[i]);
+ if (i != 0) output << wxT(',');
if (linelng > 70)
{
linelng = 0;
- output << _T("\n");
+ output << wxT("\n");
}
output << tmp;
linelng += tmp.Length()+1;
delete[] buffer;
- output += _T("};\n\n");
+ output += wxT("};\n\n");
return output;
}
void XmlResApp::MakePackageCPP(const wxArrayString& flist)
{
wxFFile file(parOutput, wxT("wt"));
- size_t i;
+ unsigned i;
if (flagVerbose)
- wxPrintf(_T("creating C++ source file ") + parOutput + _T("...\n"));
+ wxPrintf(wxT("creating C++ source file ") + parOutput + wxT("...\n"));
file.Write(""
"//\n"
wxString mime;
wxString ext = wxFileName(flist[i]).GetExt();
- if ( ext.Lower() == _T("xrc") )
- mime = _T("text/xml");
+ if ( ext.Lower() == wxT("xrc") )
+ mime = wxT("text/xml");
+#if wxUSE_MIMETYPE
else
{
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
if ( ft )
+ {
ft->GetMimeType(&mime);
+ delete ft;
+ }
}
+#endif // wxUSE_MIMETYPE
s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] +
- "\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n",
+ "\"), xml_res_file_%u, xml_res_size_%u, wxT(\"%s\"));\n",
i, i, mime.c_str());
file.Write(s);
}
void XmlResApp::GenCPPHeader()
{
- wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\');
- wxString heaFileName = fileSpec + _T(".h");
+ // Generate the output header in the same directory as the source file.
+ wxFileName headerName(parOutput);
+ headerName.SetExt("h");
- wxFFile file(heaFileName, wxT("wt"));
+ wxFFile file(headerName.GetFullPath(), wxT("wt"));
file.Write(
"//\n"
"// This file was automatically generated by wxrc, do not edit by hand.\n"
"//\n\n"
-"#ifndef __" + fileSpec + "_h__\n"
-"#define __" + fileSpec + "_h__\n"
+"#ifndef __" + headerName.GetName() + "_h__\n"
+"#define __" + headerName.GetName() + "_h__\n"
);
for(size_t i=0;i<aXRCWndClassData.GetCount();++i){
aXRCWndClassData.Item(i).GenerateHeaderCode(file);
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
const size_t lng = wx_truncate_cast(size_t, offset);
- wxASSERT_MSG( offset == lng, wxT("Huge file not supported") );
+ wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
+ wxT("Huge file not supported") );
- snum.Printf(_T("%i"), num);
+ snum.Printf(wxT("%i"), num);
output = " xml_res_file_" + snum + " = '''\\\n";
unsigned char *buffer = new unsigned char[lng];
linelng = 0;
}
else if (c < 32 || c > 127 || c == '\'')
- tmp.Printf(_T("\\x%02x"), c);
+ tmp.Printf(wxT("\\x%02x"), c);
else if (c == '\\')
- tmp = _T("\\\\");
+ tmp = wxT("\\\\");
else
tmp = (wxChar)c;
if (linelng > 70)
{
linelng = 0;
- output << _T("\\\n");
+ output << wxT("\\\n");
}
output << tmp;
linelng += tmp.Length();
delete[] buffer;
- output += _T("'''\n\n");
+ output += wxT("'''\n\n");
return output;
}
void XmlResApp::MakePackagePython(const wxArrayString& flist)
{
wxFFile file(parOutput, wxT("wt"));
- size_t i;
+ unsigned i;
if (flagVerbose)
- wxPrintf(_T("creating Python source file ") + parOutput + _T("...\n"));
+ wxPrintf(wxT("creating Python source file ") + parOutput + wxT("...\n"));
file.Write(
"#\n"
{
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++)
void XmlResApp::OutputGettext()
{
- wxArrayString str = FindStrings();
+ ExtractedStrings str = FindStrings();
wxFFile fout;
if (parOutput.empty())
else
fout.Open(parOutput, wxT("wt"));
- for (size_t i = 0; i < str.GetCount(); i++)
- fout.Write("_(\"" + str[i] + "\");\n");
+ for (ExtractedStrings::const_iterator i = str.begin(); i != str.end(); ++i)
+ {
+ const wxFileName filename(i->filename);
+
+ wxString s;
+ s.Printf("#line %d \"%s\"\n",
+ i->lineNo, filename.GetFullPath(wxPATH_UNIX));
+
+ fout.Write(s);
+ fout.Write("_(\"" + i->str + "\");\n");
+ }
if (!parOutput) fout.Detach();
}
-wxArrayString XmlResApp::FindStrings()
+ExtractedStrings XmlResApp::FindStrings()
{
- wxArrayString arr, a2;
+ ExtractedStrings arr, a2;
for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
- wxPrintf(_T("processing ") + parFiles[i] + _T("...\n"));
+ wxPrintf(wxT("processing ") + parFiles[i] + wxT("...\n"));
wxXmlDocument doc;
if (!doc.Load(parFiles[i]))
{
- wxLogError(_T("Error parsing file ") + parFiles[i]);
+ wxLogError(wxT("Error parsing file ") + parFiles[i]);
retCode = 1;
continue;
}
- a2 = FindStrings(doc.GetRoot());
+ a2 = FindStrings(parFiles[i], doc.GetRoot());
+
WX_APPEND_ARRAY(arr, a2);
}
}
-wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
+ExtractedStrings
+XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node)
{
- wxArrayString arr;
+ ExtractedStrings arr;
wxXmlNode *n = node;
if (n == NULL) return arr;
n->GetType() == wxXML_CDATA_SECTION_NODE) &&
// ...it is textnode...
(
- node/*not n!*/->GetName() == _T("label") ||
- (node/*not n!*/->GetName() == _T("value") &&
+ node/*not n!*/->GetName() == wxT("label") ||
+ (node/*not n!*/->GetName() == wxT("value") &&
!n->GetContent().IsNumber()) ||
- node/*not n!*/->GetName() == _T("help") ||
- node/*not n!*/->GetName() == _T("longhelp") ||
- node/*not n!*/->GetName() == _T("tooltip") ||
- node/*not n!*/->GetName() == _T("htmlcode") ||
- node/*not n!*/->GetName() == _T("title") ||
- node/*not n!*/->GetName() == _T("item")
+ node/*not n!*/->GetName() == wxT("help") ||
+ node/*not n!*/->GetName() == wxT("longhelp") ||
+ node/*not n!*/->GetName() == wxT("tooltip") ||
+ node/*not n!*/->GetName() == wxT("htmlcode") ||
+ node/*not n!*/->GetName() == wxT("title") ||
+ node/*not n!*/->GetName() == wxT("item")
))
// ...and known to contain translatable string
{
if (!flagGettext ||
- node->GetPropVal(_T("translate"), _T("1")) != _T("0"))
+ node->GetAttribute(wxT("translate"), wxT("1")) != wxT("0"))
{
- arr.Add(ConvertText(n->GetContent()));
+ arr.push_back
+ (
+ ExtractedString
+ (
+ ConvertText(n->GetContent()),
+ filename,
+ n->GetLineNumber()
+ )
+ );
}
}
// subnodes:
if (n->GetType() == wxXML_ELEMENT_NODE)
{
- wxArrayString a2 = FindStrings(n);
+ ExtractedStrings a2 = FindStrings(filename, n);
WX_APPEND_ARRAY(arr, a2);
}
projects / wxWidgets.git / blobdiff