Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 0678587f36d9ec41869806ebb55c278b8ed9e2c7..3276be718641f2bcd3302d3ee6a28c916bfdd604 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,33 +4,32 @@
 // 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__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "fs_zip.h"
 #endif
 
 #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"
+

 
 

-class WXDLLEXPORT wxHashTableLong;
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);

 
 

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

 // wxZipFSHandler
 // wxZipFSHandler

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

 
 

-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler

 {
     public:
         wxZipFSHandler();
 {
     public:
         wxZipFSHandler();


@@ -42,12 +41,15 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 
     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();

+        void CloseArchive(class wxZipInputStream *archive);
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)

 };
 
 
 };