fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason...

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

diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 83092fe39262caf1455118a5e986493075145643..9d7ae4fe10b04220210168e7ea99fb9b162fe5d7 100644 (file)
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -17,12 +17,12 @@
 
 #include "wx/fs_arc.h"
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/intl.h"
     #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"
@@ -406,14 +406,14 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
         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
 
     return new wxFSFile(s,
                         key + right,
-                        GetMimeTypeFromExt(location),
+                        wxEmptyString,
                         GetAnchor(location)
 #if wxUSE_DATETIME
                         , entry->GetDateTime()