bad idea, fn_str() returns wchar_t on win32 in Unicode build, we need char* here...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index d322d775477aef6aa89885b347f18bb17f4da764..8c928d263af2e2817fba4017d9d9312ed9a80541 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -151,7 +151,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     m_ZipFile = left;
     wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
-    m_Archive = (void*) unzOpen(nativename.fn_str());
+    m_Archive = (void*) unzOpen(nativename.mb_str(wxConvFile));
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 9401ef1c1a95aa22676dcd85f3c5900fd25318ac..d01d464df2c093e939b20b145099e47ae09ae371 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -40,7 +40,7 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     m_Pos = 0;
     m_Size = 0;
-    m_Archive = (void*) unzOpen(archive.fn_str());
+    m_Archive = (void*) unzOpen(archive.mb_str(wxConvFile));
     if (m_Archive == NULL)
     {
         m_lasterror = wxSTREAM_READ_ERROR;