wxMotif now uses wxGLCanvas implementation from wxX11,

[wxWidgets.git] / src / common / fs_zip.cpp

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 3e879ecfdd6a04ac6d7972e2bc99c68a3d3127bf..bb449aab85aaf358a9afbdba6819ba4769eddad6 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -9,7 +9,7 @@
 
 
 
 
 
 

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

 #pragma implementation "fs_zip.h"
 #endif
 
 #pragma implementation "fs_zip.h"
 #endif
 


@@ -38,8 +38,8 @@
 #include "unzip.h"
 #endif
 
 #include "unzip.h"
 #endif
 

-WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual,
-                              wxLongToLongHashMap );
+WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
+                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );

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


@@ -208,7 +208,7 @@ wxString wxZipFSHandler::DoFind()
                 wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
                 if (it == m_DirsFound->end())
                 {
                 wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
                 if (it == m_DirsFound->end())
                 {

-                    m_DirsFound[key] = 1;
+                    (*m_DirsFound)[key] = 1;

                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&