Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / fs_inet.h

diff --git a/include/wx/fs_inet.h b/include/wx/fs_inet.h
index 16ef29757970d5a6b92388b4bcd773ce4454cd99..bde0c69546dd2202c7807591800299abdf4c8a03 100644 (file)
--- a/include/wx/fs_inet.h
+++ b/include/wx/fs_inet.h
@@ -1,53 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_inet.h
+// Name:        wx/fs_inet.h

 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-
-REMARKS :
-
-This FS creates local cache (in /tmp directory). The cache is freed
-on program exit.
-
-Size of cache is limited to cca 1000 items (due to GetTempFileName
-limitation)
-
-
-*/

 #ifndef _WX_FS_INET_H_
 #define _WX_FS_INET_H_
 
 #ifndef _WX_FS_INET_H_
 #define _WX_FS_INET_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "fs_inet.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
 
 #include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
 

-#ifndef WXPRECOMP
-    #include "wx/hash.h"
-#endif
-

 #include "wx/filesys.h"
 
 #include "wx/filesys.h"
 

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxInternetFSHandler
 // wxInternetFSHandler

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxInternetFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_NET wxInternetFSHandler : public wxFileSystemHandler

 {
 {

-    private:
-        wxHashTable m_Cache;
-

     public:
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
     public:
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);

-        ~wxInternetFSHandler();

 };
 
 #endif
 };
 
 #endif