A few tweaks and cleanups

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index b884fe055b55116de7980e18a02a737c18180e6a..960a1fd1a5559f6003b3fa6b59c3a60f3e6217dd 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,12 +3,15 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
+// CVS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma interface "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
@@ -19,13 +22,10 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
-
-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "wx/filesys.h"
 
+class WXDLLEXPORT wxHashTableLong;
+
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------
@@ -39,13 +39,14 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
         ~wxZipFSHandler();
-        
+
     private:
         // these vars are used by FindFirst/Next:
         void *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
-        
+        wxHashTableLong *m_DirsFound;
+
         wxString DoFind();
 };
 
@@ -53,3 +54,5 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
+#endif // _WX_FS_ZIP_H_
+