X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa66113dfa36c1636a646e3feb748c298806ccb..41b1047d910c3aba988b5b619ba885b7ac89cf20:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index a9939637d2..d390e17df0 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -11,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #ifdef __BORDLANDC__ #pragma hdrstop @@ -20,7 +20,7 @@ #if wxUSE_FS_ZIP #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/filesys.h" @@ -61,7 +61,7 @@ wxZipFSHandler::~wxZipFSHandler() bool wxZipFSHandler::CanOpen(const wxString& location) { wxString p = GetProtocol(location); - return (p == "zip"); + return (p == wxT("zip") ); } @@ -73,14 +73,14 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l wxString left = GetLeftLocation(location); wxInputStream *s; - if (GetProtocol(left) != "file") { + if (GetProtocol(left) != wxT("file")) { return NULL; } s = new wxZipInputStream(left, right); if (s && (s -> LastError() == wxStream_NOERROR)) { return new wxFSFile(s, - left + "#zip:" + right, + left + wxT("#zip:") + right, GetMimeTypeFromExt(location), GetAnchor(location)); } @@ -101,7 +101,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags) m_Archive = NULL; } - if (GetProtocol(left) != "file") { + if (GetProtocol(left) != wxT("file")) { return wxEmptyString; } @@ -146,7 +146,7 @@ wxString wxZipFSHandler::DoFind() while (match == wxEmptyString) { unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0); - for (c = namebuf; *c; c++) if (*c == '\\') *c = '/'; + for (c = namebuf; *c; c++) if (*c == wxT('\\')) *c = wxT('/'); fn = namebuf; if (fn.Last() == wxT('/')) { fn.RemoveLast();