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

A couple of fixes for wxChm

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2010-09-30 13:09:08 +00:00
parent 480c0b2864
commit ea44a9343c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/chm.cpp
View File

@@ -605,8 +605,11 @@ wxChmInputStream::CreateHHPStream()
switch (code)
{
case 0: // CONTENTS_FILE
tmp = "Contents file=";
hhc=true;
if (len)
{
tmp = "Contents file=";
hhc=true;
}
break;
case 1: // INDEX_FILE
tmp = "Index file=";
@@ -635,9 +638,10 @@ wxChmInputStream::CreateHHPStream()
// LCID at position 0
wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
wxString msg ;
msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
out->Write(msg.c_str() , msg.length() ) ;
char msg[64];
int len = sprintf(msg, "Language=0x%X\r\n", lcid) ;
if (len > 0)
out->Write(msg, len) ;
}
break ;
default:
@@ -833,7 +837,7 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
left + _T("#chm:") + right,
mime,
GetAnchor(location),
wxDateTime(wxFileModificationTime(left)));
wxDateTime(leftFilename.GetModificationTime()));
}
delete s;