]> git.saurik.com Git - wxWidgets.git/commitdiff
reverted previous commit, it broke URLs parsing
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 28 Mar 2004 15:58:00 +0000 (15:58 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 28 Mar 2004 15:58:00 +0000 (15:58 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/filesys.cpp

index 8fab430376ae5ade5f6d42b84c31a44c837e8c61..5e10fd8d447608a1455a4868bfb9510d0aa85065 100644 (file)
@@ -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);
 }