Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted previous commit, it broke URLs parsing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-03-28 15:58:00 +00:00
parent 8b0d53975d
commit f8ae31dcc5
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/filesys.cpp
View File

@@ -157,24 +157,11 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
for (i = l-1; for (i = l-1;
(i >= 0) && (i >= 0) &&
((location[i] != wxT(':')) || (i == 1) || ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
(location[i-2] == wxT(':'))
#ifdef __WXMSW__
|| ((i > 3) && location[i-4] == wxT(':')) // E.g. file://C:/thing.jpg
#endif
);
i--) i--)
{ {
if (location[i] == wxT('#')) l2 = i + 1; if (location[i] == wxT('#')) l2 = i + 1;
} }
#ifdef __WXMSW__
// We may now have //c:/thing.jpg
if (((i + 4) < l) && location[i+1] == wxT('/') && location[i+2] == wxT('/') &&
location[i+4] == wxT(':'))
{
i = i + 2;
}
#endif
if (i == 0) return wxEmptyString; if (i == 0) return wxEmptyString;
else return location.Mid(i + 1, l2 - i - 2); else return location.Mid(i + 1, l2 - i - 2);
} }