Fixed initialisation order warning

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 1687d56655332d65c7a88ae6b79dec3b5a67122c..e98b3f82ad48f02b262ed7a2d276e37648613a09 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,31 +4,26 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "fs_zip.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 #include "wx/filesys.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 #include "wx/filesys.h"

+#include "wx/hashmap.h"
+
+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);

 
 

-class WXDLLIMPEXP_BASE wxHashTableLong;

 
 

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

 // wxZipFSHandler
 // wxZipFSHandler

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

 
 class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {
 
 class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {


@@ -38,14 +33,15 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();

-        ~wxZipFSHandler();
+        void Cleanup();
+        virtual ~wxZipFSHandler();

 
     private:
         // these vars are used by FindFirst/Next:
 
     private:
         // these vars are used by FindFirst/Next:

-        void *m_Archive;
+        class wxZipInputStream *m_Archive;

         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

-        wxHashTableLong *m_DirsFound;
+        wxZipFilenameHashMap *m_DirsFound;

 
         wxString DoFind();
 
 
         wxString DoFind();