Better place for coordinate mirroring and removal

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index d927b9aa7472449ef1eb4c9ea1de3dc8c1346167..26080da98779d71a5534e0583a5ba6b509ebba4d 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -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


@@ -140,12 +140,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)