bug in wxMenuBase::FindChildItem() corrected

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 3c016825ac61769f6d5abbeaed69977eecbe4a7d..0a1e19d31a43a6ea0efcd73cc67337d7ea9f669e 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -23,22 +23,28 @@ limitation)
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 

+#if !wxUSE_SOCKETS
+    #undef wxUSE_FS_INET
+    #define wxUSE_FS_INET 0
+#endif
+

 #if wxUSE_FS_INET
 
 #ifndef WXPRECOMP
 #if wxUSE_FS_INET
 
 #ifndef WXPRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 #include "wx/wfstream.h"
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
 #endif
 
 #include "wx/wfstream.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
 {


@@ -64,15 +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 == "http") || (p == "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) + ":" + GetRightLocation(location);
+    wxString right = GetProtocol(location) + wxT(":") + GetRightLocation(location);

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


@@ -80,36 +84,42 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:
     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);
         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

-        if (s) {
-            char buf[256];
+        if (s)
+        {
+            wxChar buf[256];

 
 

-            wxGetTempFileName("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;
         }
                 s -> Read(sout); // copy the stream
             }
             delete s;
         }

-        else return NULL; //we can't open the URL
+        else
+        {
+            return (wxFSFile*) NULL; // we can't open the URL
+        }

     }
 
     // Load item from cache:
     }
 
     // Load item from cache:

-    s = new wxFileInputStream(info -> GetTemp());
-    if (s) {
+    s = new wxFileInputStream(info->GetTemp());
+    if (s)
+    {

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

-                            info -> GetMime(),
+                            info->GetMime(),

                             GetAnchor(location));
     }
                             GetAnchor(location));
     }

-    else return NULL;
+    else return (wxFSFile*) NULL;

 }
 
 
 }
 
 


@@ -120,11 +130,27 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();

-    while ((n = m_Cache.Next()) != NULL) {
-        n2 = (wxInetCacheNode*) n -> GetData();
-        wxRemoveFile(n2 -> GetTemp());
+    while ((n = m_Cache.Next()) != NULL)
+    {
+        n2 = (wxInetCacheNode*) n->GetData();
+        wxRemoveFile(n2->GetTemp());

         delete n2;
     }
 }
 
         delete n2;
     }
 }
 

+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
 #endif // wxUSE_FS_INET