X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324dbfec39cc030027830a100239cb9a4e6624e8..b730516c980c0574ef129e51067ea477b24df873:/src/common/fs_inet.cpp

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index b9f2bed175..dfbc008965 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -29,6 +29,11 @@ limitation)
 #pragma hdrstop
 #endif
 
+#if !wxUSE_SOCKETS
+    #undef wxUSE_FS_INET
+    #define wxUSE_FS_INET 0
+#endif
+
 #if wxUSE_FS_INET
 
 #ifndef WXPRECOMP
@@ -78,35 +83,40 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:
-    if (!info == NULL) 
+    if (info == NULL)
     {
         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
-        if (s) 
+        if (s)
 	{
-            char buf[256];
+            wxChar buf[256];
 
-            wxGetTempFileName( "wxhtml", buf);
+            wxGetTempFileName( _T("wxhtml"), buf);
             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:
+#if defined(__VISAGECPP__)
+// VA thinks this is an ambiguous call
+                wxFileOutputStream sout((wxString)buf);
+#else
                 wxFileOutputStream sout(buf);
+#endif
                 s -> Read(sout); // copy the stream
             }
             delete s;
         }
         else
-	{ 
-	    return (wxFSFile*) NULL; // we can't open the URL
-	}
+        {
+            return (wxFSFile*) NULL; // we can't open the URL
+        }
     }
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());
-    if (s) 
+    if (s)
     {
         return new wxFSFile(s,
                             right,
@@ -124,7 +134,7 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
-    while ((n = m_Cache.Next()) != NULL) 
+    while ((n = m_Cache.Next()) != NULL)
     {
         n2 = (wxInetCacheNode*) n->GetData();
         wxRemoveFile(n2->GetTemp());
@@ -132,4 +142,19 @@ wxInternetFSHandler::~wxInternetFSHandler()
     }
 }
 
+class wxFileSystemInternetModule : public wxModule
+{
+    DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
+
+    public:
+        virtual bool OnInit()
+        {
+            wxFileSystem::AddHandler(new wxInternetFSHandler);
+            return TRUE;
+        }
+        virtual void OnExit() {}
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
+
 #endif // wxUSE_FS_INET