Fixes so joystick not only compiles on Linux, but it actually works too!

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index fa1ddab430f9a69137afccf6b776872bd3d3f68c..ae111492dbbb6b9368af6cfb8feb26550901dd43 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -7,28 +7,29 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_

 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 
 #pragma interface "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

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

+#include "wx/hashmap.h"

 
 

-class WXDLLEXPORT wxHashTableLong;
-
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 // wxZipFSHandler
 // wxZipFSHandler

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

 
 

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

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


@@ -43,12 +44,16 @@ 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;
+        wxLongToLongHashMap *m_DirsFound;

 
         wxString DoFind();
 
         wxString DoFind();

+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)

 };
 
 
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 };
 
 
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 

+#endif // _WX_FS_ZIP_H_
+