From bafd830636e54f3bf33910993a61e2972e99e2ca Mon Sep 17 00:00:00 2001 From: David Surovell Date: Mon, 5 Dec 2005 16:25:16 +0000 Subject: [PATCH] applied patch 1373127 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/uri.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/uri.cpp b/src/common/uri.cpp index c195d13729..52b11eb5af 100644 --- 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()); } } -- 2.45.2