*** empty log message ***

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 457f9a51fd2980172402070d175820a9894ef599..55677f10ff7861e21334faaec4b4aa210b20b712 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -44,6 +44,7 @@ limitation)
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"

+#include "wx/module.h"

 
 class wxInetCacheNode : public wxObject
 {
 
 class wxInetCacheNode : public wxObject
 {


@@ -69,13 +70,13 @@ class wxInetCacheNode : public wxObject
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == _T("http")) || (p == _T("ftp"));
+    return (p == wxT("http")) || (p == wxT("ftp"));

 }
 
 
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 }
 
 
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

-    wxString right = GetProtocol(location) + _T(":") + GetRightLocation(location);
+    wxString right = GetProtocol(location) + wxT(":") + GetRightLocation(location);

     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;


@@ -89,29 +90,29 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

-        if (s) 
-       {
+        if (s)
+        {

             wxChar buf[256];
 
             wxChar buf[256];
 

-            wxGetTempFileName( _T("wxhtml"), buf);
+            wxGetTempFileName( wxT("wxhtml"), buf);

             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:
             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 
             {   // ok, now copy it:

-                wxFileOutputStream sout(buf);
+                wxFileOutputStream sout((wxString)buf);

                 s -> Read(sout); // copy the stream
             }
             delete s;
         }
         else
                 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());
     }
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());

-    if (s) 
+    if (s)

     {
         return new wxFSFile(s,
                             right,
     {
         return new wxFSFile(s,
                             right,


@@ -129,7 +130,7 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();

-    while ((n = m_Cache.Next()) != NULL) 
+    while ((n = m_Cache.Next()) != NULL)

     {
         n2 = (wxInetCacheNode*) n->GetData();
         wxRemoveFile(n2->GetTemp());
     {
         n2 = (wxInetCacheNode*) n->GetData();
         wxRemoveFile(n2->GetTemp());