use popen() instead of wxExecute(), it works inside wxYield() unlike the latter

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 2f1ed8806f00e1bb27cd541a83f90da4fbe374b8..033b1d7b5542112c555151e34f1cb36a9330e1f9 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -3,7 +3,7 @@
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWidgets Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -42,7 +42,7 @@ class wxTemporaryFileInputStream : public wxFileInputStream
 public:
     wxTemporaryFileInputStream(const wxString& filename) :
         wxFileInputStream(filename), m_filename(filename) {}
 public:
     wxTemporaryFileInputStream(const wxString& filename) :
         wxFileInputStream(filename), m_filename(filename) {}

-    
+

     ~wxTemporaryFileInputStream()
     {
         // NB: copied from wxFileInputStream dtor, we need to do it before
     ~wxTemporaryFileInputStream()
     {
         // NB: copied from wxFileInputStream dtor, we need to do it before


@@ -52,7 +52,7 @@ public:
             delete m_file;
             m_file_destroy = false;
         }
             delete m_file;
             m_file_destroy = false;
         }

-        wxRemoveFile(m_filename);        
+        wxRemoveFile(m_filename);

     }
 
 protected:
     }
 
 protected:


@@ -67,11 +67,11 @@ protected:
 static wxString StripProtocolAnchor(const wxString& location)
 {
     wxString myloc(location.BeforeLast(wxT('#')));
 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:
     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;
     {
         if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
         else myloc = wxT("/") + myloc;


@@ -84,20 +84,24 @@ static wxString StripProtocolAnchor(const wxString& location)
 
 bool wxInternetFSHandler::CanOpen(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);
     }
     wxString p = GetProtocol(location);
     if ((p == wxT("http")) || (p == wxT("ftp")))
     {
         wxURL url(p + wxT(":") + StripProtocolAnchor(location));
         return (url.GetError() == wxURL_NOERR);
     }

-
-    return FALSE;
+#endif
+    return false;

 }
 
 
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
                                         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);
 
     wxString right =
         GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
 


@@ -117,7 +121,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
                 s->Read(sout);
             }
             delete s;
                 s->Read(sout);
             }
             delete s;

-    
+

             return new wxFSFile(new wxTemporaryFileInputStream(tmpfile),
                                 right,
                                 content,
             return new wxFSFile(new wxTemporaryFileInputStream(tmpfile),
                                 right,
                                 content,


@@ -130,6 +134,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     }
 
     return (wxFSFile*) NULL; // incorrect URL
     }
 
     return (wxFSFile*) NULL; // incorrect URL

+#endif

 }
 
 
 }
 
 


@@ -141,7 +146,7 @@ class wxFileSystemInternetModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxInternetFSHandler);
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxInternetFSHandler);

-            return TRUE;
+            return true;

         }
         virtual void OnExit() {}
 };
         }
         virtual void OnExit() {}
 };