extract setters from wxHeaderColumnBase into a separate wxSettableHeaderColumn class...

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index d927b9aa7472449ef1eb4c9ea1de3dc8c1346167..835cf15a7e4594613147553362b02ae1c83a1bc2 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -20,7 +20,7 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 


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

-    ~wxTemporaryFileInputStream()
+    virtual ~wxTemporaryFileInputStream()

     {
         // NB: copied from wxFileInputStream dtor, we need to do it before
         //     wxRemoveFile
     {
         // NB: copied from wxFileInputStream dtor, we need to do it before
         //     wxRemoveFile


@@ -107,7 +107,6 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     {
         wxInputStream *s = url.GetInputStream();
         wxString content = url.GetProtocol().GetContentType();
     {
         wxInputStream *s = url.GetInputStream();
         wxString content = url.GetProtocol().GetContentType();

-        if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

         if (s)
         {
             wxString tmpfile =
         if (s)
         {
             wxString tmpfile =


@@ -140,12 +139,26 @@ class wxFileSystemInternetModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:

+        wxFileSystemInternetModule() :
+           wxModule(),
+           m_handler(NULL)
+        {
+        }
+

         virtual bool OnInit()
         {
         virtual bool OnInit()
         {

-            wxFileSystem::AddHandler(new wxInternetFSHandler);
+            m_handler = new wxInternetFSHandler;
+            wxFileSystem::AddHandler(m_handler);

             return true;
         }
             return true;
         }

-        virtual void OnExit() {}
+
+        virtual void OnExit() 
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);
+        }
+
+    private:
+        wxFileSystemHandler* m_handler;

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)