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

fixed ANSI/Unicode incompatibility of the cache (bug 663396)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-01-08 19:44:53 +00:00
parent 4198a06d0b
commit 593f309670
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/html/helpdata.cpp
View File

@@ -337,7 +337,12 @@ inline static wxChar* CacheReadString(wxInputStream *f)
#endif #endif
} }
#define CURRENT_CACHED_BOOK_VERSION 3 #define CURRENT_CACHED_BOOK_VERSION 4
// Additional flags to detect incompatibilities of the runtime environment:
#define CACHED_BOOK_FORMAT_FLAGS \
(wxUSE_UNICODE << 0)
bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f) bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
{ {
@@ -356,6 +361,9 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
return FALSE; return FALSE;
} }
if (CacheReadInt32(f) != CACHED_BOOK_FORMAT_FLAGS)
return FALSE;
/* load contents : */ /* load contents : */
st = m_ContentsCnt; st = m_ContentsCnt;
m_ContentsCnt += CacheReadInt32(f); m_ContentsCnt += CacheReadInt32(f);
@@ -393,6 +401,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
/* save header - version info : */ /* save header - version info : */
CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION); CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION);
CacheWriteInt32(f, CACHED_BOOK_FORMAT_FLAGS);
/* save contents : */ /* save contents : */
for (cnt = 0, i = 0; i < m_ContentsCnt; i++) for (cnt = 0, i = 0; i < m_ContentsCnt; i++)