Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 26080da98779d71a5534e0583a5ba6b509ebba4d..6a9a4793018b7d3c5c4c1533f8b3299d43c31ed5 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -3,7 +3,6 @@
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,7 +19,7 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
 
@@ -107,7 +106,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 =
@@ -130,7 +128,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
         }
     }
 
-    return (wxFSFile*) NULL; // incorrect URL
+    return NULL; // incorrect URL
 #endif
 }
 
@@ -153,7 +151,7 @@ class wxFileSystemInternetModule : public wxModule
             return true;
         }
 
-        virtual void OnExit() 
+        virtual void OnExit()
         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }