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
This commit is contained in:
parent
15c2acd23d
commit
e83389ff45
@ -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('/'));
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user