applied patch 1373127

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

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index c195d13729c3d93ea5b632d62f76f0b3b56adbf4..52b11eb5afac2441341c8d9af59accdb6c7e1e58 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -882,8 +882,8 @@ void wxURI::Resolve(const wxURI& base, int flags)
                     op += 3;
             }
 
-            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
-                    m_path.substr((op - m_path.c_str()), m_path.Length());
+            m_path = (wxString)base.m_path.substr(0, bp - base.m_path.c_str()) +
+                    (wxString)m_path.substr((op - m_path.c_str()), m_path.Length());
         }
     }