Don't handle branches specially when sorting items in wxDataViewCtrl.

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

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index ff639417dd080ec1c23f0b9fe6f96459390b0e05..bd6c244f4bf90c178bc3574b9d0435a012eb17f4 100644 (file)
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_arc.cpp
+// Name:        src/common/fs_arc.cpp

 // Purpose:     wxArchive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
 // Purpose:     wxArchive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell


@@ -22,7 +22,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM

     #include "wx/zipstrm.h"
 #else
     #include "wx/archive.h"
     #include "wx/zipstrm.h"
 #else
     #include "wx/archive.h"


@@ -135,10 +135,8 @@ wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
 
 void wxArchiveFSCacheDataImpl::CloseStreams()
 {
 
 void wxArchiveFSCacheDataImpl::CloseStreams()
 {

-    delete m_archive;
-    m_archive = NULL;
-    delete m_stream;
-    m_stream = NULL;
+    wxDELETE(m_archive);
+    wxDELETE(m_stream);

 }
 
 wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
 }
 
 wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)


@@ -360,7 +358,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
         right = rightPart.GetFullPath(wxPATH_UNIX);
     }
 
         right = rightPart.GetFullPath(wxPATH_UNIX);
     }
 

-    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+    if (!right.empty() && right.GetChar(0) == wxT('/')) right = right.Mid(1);

 
     if (!m_cache)
         m_cache = new wxArchiveFSCache;
 
     if (!m_cache)
         m_cache = new wxArchiveFSCache;


@@ -406,7 +404,7 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
         return NULL;
     }
 
         return NULL;
     }
 

-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM

     if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
         ((wxZipInputStream*)s)->m_allowSeeking = true;
 #endif // WXWIN_COMPATIBILITY_2_6
     if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
         ((wxZipInputStream*)s)->m_allowSeeking = true;
 #endif // WXWIN_COMPATIBILITY_2_6