Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxLogError/Warning into wxHTML

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-23 21:47:41 +00:00
parent b662c13583
commit f3c8285953
5 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/html/helpdata.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/busyinfo.h"
#include "wx/encconv.h"
#include "wx/fontmap.h"
#include "wx/log.h"
#include "wx/html/htmlpars.h"
#include "wx/html/htmldefs.h"
@@ -233,6 +234,8 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
handler -> WriteOut(m_Contents, m_ContentsCnt);
delete[] buf;
}
else
wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str());
f = ( indexfile.IsEmpty() ? 0 : fsys.OpenFile(indexfile) );
if (f) {
@@ -246,6 +249,8 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
handler -> WriteOut(m_Index, m_IndexCnt);
delete[] buf;
}
else
wxLogError(_("Cannot open index file: %s"), indexfile.mb_str());
return TRUE;
}
@@ -278,9 +283,13 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
f -> Read(&x, sizeof(x));
version = wxINT32_SWAP_ON_BE(x);
if (version != CURRENT_CACHED_BOOK_VERSION) return FALSE;
if (version != CURRENT_CACHED_BOOK_VERSION)
{
wxLogError(_("Incorrect version of HTML help book"));
return FALSE;
// NOTE: when adding new version, please ensure backward compatibility!
}
/* load contents : */
f -> Read(&x, sizeof(x));
@@ -517,7 +526,11 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
else bookFull = wxGetCwd() + "/" + book;
fi = fsys.OpenFile(bookFull);
if (fi == NULL) return FALSE;
if (fi == NULL)
{
wxLogError(_("Cannot open HTML help book: %s"), bookFull.mb_str());
return FALSE;
}
fsys.ChangePathTo(bookFull);
s = fi -> GetStream();
sz = s -> GetSize();