Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 7e9ce0fe0287920e70b4829f3a58a1549f1a8b4d..033b1d7b5542112c555151e34f1cb36a9330e1f9 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -67,11 +67,11 @@ protected:
 static wxString StripProtocolAnchor(const wxString& location)
 {
     wxString myloc(location.BeforeLast(wxT('#')));
-    if (myloc.IsEmpty()) myloc = location.AfterFirst(wxT(':'));
+    if (myloc.empty()) myloc = location.AfterFirst(wxT(':'));
     else myloc = myloc.AfterFirst(wxT(':'));
 
     // fix malformed url:
-    if (myloc.Left(2) != wxT("//"))
+    if (!myloc.Left(2).IsSameAs(wxT("//")))
     {
         if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
         else myloc = wxT("/") + myloc;
@@ -84,13 +84,14 @@ static wxString StripProtocolAnchor(const wxString& location)
 
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
+#if wxUSE_URL
     wxString p = GetProtocol(location);
     if ((p == wxT("http")) || (p == wxT("ftp")))
     {
         wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);
     }
-
+#endif
     return false;
 }
 
@@ -98,6 +99,9 @@ bool wxInternetFSHandler::CanOpen(const wxString& location)
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
                                         const wxString& location)
 {
+#if !wxUSE_URL
+    return NULL;
+#else
     wxString right =
         GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
 
@@ -130,6 +134,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     }
 
     return (wxFSFile*) NULL; // incorrect URL
+#endif
 }