compilation fix for cygwin

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 27ccee6f1a506a61511f03cc7b8bd3a65e80d86f..cfc1a995252db1f2099d1b4fcc71e5d96f0c7361 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -7,8 +7,10 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fs_zip.h"
 #endif
 
@@ -20,11 +22,6 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
-
-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "wx/filesys.h"
 
 class WXDLLEXPORT wxHashTableLong;
@@ -42,14 +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();
 };
 
@@ -57,3 +54,5 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
+#endif // _WX_FS_ZIP_H_
+