X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f76dbc4d52c005b63745cf924efe30eece4c6f79..a63f2bec290ddf058718c8465a56c3ef421685eb:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index b0f1c67a4c..e7b83b9b21 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -21,7 +21,7 @@ #define wxUSE_FS_INET 0 #endif -#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS +#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS #include "wx/wfstream.h" #include "wx/module.h" @@ -312,10 +312,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) while (node) { wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); - if (h->CanOpen(m_Path + location)) + if (h->CanOpen(m_Path + loc)) { - s = h->OpenFile(*this, m_Path + location); - if (s) { m_LastName = m_Path + location; break; } + s = h->OpenFile(*this, m_Path + loc); + if (s) { m_LastName = m_Path + loc; break; } } node = node->GetNext(); } @@ -328,10 +328,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location) while (node) { wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); - if (h->CanOpen(location)) + if (h->CanOpen(loc)) { - s = h->OpenFile(*this, location); - if (s) { m_LastName = location; break; } + s = h->OpenFile(*this, loc); + if (s) { m_LastName = loc; break; } } node = node->GetNext(); }