From: Václav Slavík Date: Sun, 28 Mar 2004 15:58:00 +0000 (+0000) Subject: reverted previous commit, it broke URLs parsing X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f8ae31dcc54060ea58ea893166ce2cffb9413bb7?ds=inline reverted previous commit, it broke URLs parsing git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 8fab430376..5e10fd8d44 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -157,24 +157,11 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const for (i = l-1; (i >= 0) && - ((location[i] != wxT(':')) || (i == 1) || - (location[i-2] == wxT(':')) -#ifdef __WXMSW__ - || ((i > 3) && location[i-4] == wxT(':')) // E.g. file://C:/thing.jpg -#endif - ); + ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) { 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; else return location.Mid(i + 1, l2 - i - 2); }