From e83389ff45206ea98efc4b44f783691b54d4fa96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 29 Dec 2003 09:32:36 +0000 Subject: [PATCH] bad idea, fn_str() returns wchar_t on win32 in Unicode build, we need char* here no matter what git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fs_zip.cpp | 2 +- src/common/zipstrm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index d322d77547..8c928d263a 100644 --- 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 9401ef1c1a..d01d464df2 100644 --- 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; -- 2.45.2