patch 580632 - fixes incorrect path problem in wxrc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index 34a25c872e96d387e2b64b8eba9a8cf5189e5424..38b5ac59fc62ddcbe7a2c35f6d4a3dcebc1f995a 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -262,7 +262,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             // ...and known to contain filename
         {
             wxString fullname;
-            if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();
             else fullname = inputPath + "/" + n->GetContent();
 
             if (flagVerbose) 

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 34a25c872e96d387e2b64b8eba9a8cf5189e5424..38b5ac59fc62ddcbe7a2c35f6d4a3dcebc1f995a 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -262,7 +262,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             // ...and known to contain filename
         {
             wxString fullname;
-            if (wxIsAbsolutePath(n->GetContent())) fullname = n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();
             else fullname = inputPath + "/" + n->GetContent();
 
             if (flagVerbose)