removed wxUSE_XPM_IN_MSW from setup0.h

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 53d866fd81663ec69fdca69a253e4db6bb966318..27ccee6f1a506a61511f03cc7b8bd3a65e80d86f 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,12 +3,13 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma interface "fs_zip.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -17,7 +18,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS

 
 
 #ifndef WXPRECOMP
 
 
 #ifndef WXPRECOMP


@@ -26,6 +27,8 @@
 
 #include "wx/filesys.h"
 
 
 #include "wx/filesys.h"
 

+class WXDLLEXPORT wxHashTableLong;
+

 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------


@@ -45,11 +48,12 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         void *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
         void *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

+        wxHashTableLong *m_DirsFound;

         
         wxString DoFind();
 };
 
 
 #endif
         
         wxString DoFind();
 };
 
 
 #endif

-  // wxUSE_FS_ZIP && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS