moving focus rect overlap problems to the vis region of a window

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 8fab430376ae5ade5f6d42b84c31a44c837e8c61..814d17d6a6dbd4f5dbec199443c35c51ec60308c 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -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);
 }
@@ -532,7 +519,7 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
     // unc notation, wxMSW
     if ( url.Find(wxT("\\\\")) == 0 ) 
     {
-        url = url.Mid(2);
+        url = wxT("//") + url.Mid(2);
     }
     else
     {