applied patch 1683441

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

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index c69153cdce6950e39f0d90f541edb1ef61805d06..a00e6accd7a13f68be036ae2af134b50003bba92 100644 (file)
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -22,9 +22,13 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/archive.h"
-#include "wx/fileback.h"
-#include "wx/thread.h"
+#if WXWIN_COMPATIBILITY_2_6
+    #include "wx/zipstrm.h"
+#else
+    #include "wx/archive.h"
+#endif
+
+#include "wx/private/fileback.h"
 
 //---------------------------------------------------------------------------
 // wxArchiveFSCacheDataImpl
@@ -120,7 +124,7 @@ wxArchiveFSCacheDataImpl::~wxArchiveFSCacheDataImpl()
 
 wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
 {
-    m_hash[entry->GetName()] = entry;
+    m_hash[entry->GetName(wxPATH_UNIX)] = entry;
     wxArchiveFSEntry *fse = new wxArchiveFSEntry;
     *m_endptr = fse;
     (*m_endptr)->entry = entry;
@@ -153,7 +157,7 @@ wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
     {
         AddToCache(entry);
 
-        if (entry->GetName() == name)
+        if (entry->GetName(wxPATH_UNIX) == name)
             return entry;
     }
 
@@ -394,6 +398,12 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
     s->OpenEntry(*entry);
 
     if (s && s->IsOk())
+    {
+#if WXWIN_COMPATIBILITY_2_6
+        if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
+            ((wxZipInputStream*)s)->m_allowSeeking = true;
+#endif // WXWIN_COMPATIBILITY_2_6
+
         return new wxFSFile(s,
                             key + right,
                             GetMimeTypeFromExt(location),
@@ -402,6 +412,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
                             , entry->GetDateTime()
 #endif // wxUSE_DATETIME
                             );
+    }
 
     delete s;
     return NULL;