X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d9eee83203dfc7177cd8639c14a5c809085698d..e7bdf0ac8d2f095062b054e1adffd283c1d507a4:/utils/wxrc/wxrc.cpp diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index d6b9799e92..f5158fd2ab 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -3,7 +3,6 @@ // Purpose: XML resource compiler // Author: Vaclav Slavik, Eduardo Marques // Created: 2000/03/05 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +31,7 @@ #include "wx/mimetype.h" #include "wx/vector.h" -WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual, StringSet); +WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet); class XRCWidgetData { @@ -356,7 +355,8 @@ void XmlResApp::CompileRes() { wxArrayString files = PrepareTempFiles(); - wxRemoveFile(parOutput); + if ( wxFileExists(parOutput) ) + wxRemoveFile(parOutput); if (!retCode) { @@ -952,7 +952,14 @@ XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node) node/*not n!*/->GetName() == wxT("tooltip") || node/*not n!*/->GetName() == wxT("htmlcode") || node/*not n!*/->GetName() == wxT("title") || - node/*not n!*/->GetName() == wxT("item") + node/*not n!*/->GetName() == wxT("item") || + node/*not n!*/->GetName() == wxT("message") || + node/*not n!*/->GetName() == wxT("note") || + node/*not n!*/->GetName() == wxT("defaultdirectory") || + node/*not n!*/->GetName() == wxT("defaultfilename") || + node/*not n!*/->GetName() == wxT("defaultfolder") || + node/*not n!*/->GetName() == wxT("filter") || + node/*not n!*/->GetName() == wxT("caption") )) // ...and known to contain translatable string {