X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34e0d9f874fe4ba3dd8112a68831cb20bb80cac7..8f4745feeb2850f3bebb3af45407e164550d541a:/src/common/fs_inet.cpp diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index f2add64583..2ed1f2e865 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -1,19 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fs_inet.cpp +// Name: src/common/fs_inet.cpp // Purpose: HTTP and FTP file system // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik +// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "fs_inet.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if !wxUSE_SOCKETS @@ -23,14 +20,14 @@ #if wxUSE_FILESYSTEM && wxUSE_FS_INET -#ifndef WXPRECOMP +#ifndef WX_PRECOMP + #include "wx/module.h" #endif #include "wx/wfstream.h" #include "wx/url.h" #include "wx/filesys.h" #include "wx/fs_inet.h" -#include "wx/module.h" // ---------------------------------------------------------------------------- // Helper classes @@ -43,7 +40,7 @@ public: wxTemporaryFileInputStream(const wxString& filename) : wxFileInputStream(filename), m_filename(filename) {} - ~wxTemporaryFileInputStream() + virtual ~wxTemporaryFileInputStream() { // NB: copied from wxFileInputStream dtor, we need to do it before // wxRemoveFile @@ -67,11 +64,11 @@ protected: static wxString StripProtocolAnchor(const wxString& location) { wxString myloc(location.BeforeLast(wxT('#'))); - if (myloc.IsEmpty()) myloc = location.AfterFirst(wxT(':')); + if (myloc.empty()) myloc = location.AfterFirst(wxT(':')); else myloc = myloc.AfterFirst(wxT(':')); // fix malformed url: - if (myloc.Left(2) != wxT("//")) + if (!myloc.Left(2).IsSameAs(wxT("//"))) { if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc; else myloc = wxT("/") + myloc; @@ -110,7 +107,6 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), { wxInputStream *s = url.GetInputStream(); wxString content = url.GetProtocol().GetContentType(); - if (content == wxEmptyString) content = GetMimeTypeFromExt(location); if (s) { wxString tmpfile = @@ -133,7 +129,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), } } - return (wxFSFile*) NULL; // incorrect URL + return NULL; // incorrect URL #endif } @@ -143,12 +139,26 @@ class wxFileSystemInternetModule : public wxModule DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule) public: + wxFileSystemInternetModule() : + wxModule(), + m_handler(NULL) + { + } + virtual bool OnInit() { - wxFileSystem::AddHandler(new wxInternetFSHandler); + m_handler = new wxInternetFSHandler; + wxFileSystem::AddHandler(m_handler); return true; } - virtual void OnExit() {} + + virtual void OnExit() + { + delete wxFileSystem::RemoveHandler(m_handler); + } + + private: + wxFileSystemHandler* m_handler; }; IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)