Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 5df4232e85e38b36b03db03cb4acc8842a955901..ff639417dd080ec1c23f0b9fe6f96459390b0e05 100644 (file)
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -17,14 +17,18 @@
 
 #include "wx/fs_arc.h"
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/intl.h"
     #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;
     }
 
@@ -285,7 +289,7 @@ wxArchiveFSCacheData* wxArchiveFSCache::Add(
         const wxArchiveClassFactory& factory,
         wxInputStream *stream)
 {
-    wxArchiveFSCacheData& data(m_hash[name]);
+    wxArchiveFSCacheData& data = m_hash[name];
 
     if (stream->IsSeekable())
         data = wxArchiveFSCacheData(factory, stream);
@@ -391,20 +395,30 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
     }
 
     wxArchiveInputStream *s = factory->NewStream(leftStream);
+    if ( !s )
+        return NULL;
+
     s->OpenEntry(*entry);
 
-    if (s && s->IsOk())
-        return new wxFSFile(s,
-                            key + right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location)
+    if (!s->IsOk())
+    {
+        delete s;
+        return NULL;
+    }
+
+#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,
+                        wxEmptyString,
+                        GetAnchor(location)
 #if wxUSE_DATETIME
-                            , entry->GetDateTime()
+                        , entry->GetDateTime()
 #endif // wxUSE_DATETIME
-                            );
-
-    delete s;
-    return NULL;
+                        );
 }
 
 wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)