projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation fix for STL build after the last commit.
[wxWidgets.git]
/
src
/
html
/
helpdata.cpp
diff --git
a/src/html/helpdata.cpp
b/src/html/helpdata.cpp
index 5155113810448f1a76d08d535dbe7adbc1089e7f..edebdcc7fbf15a75ab21deb53c0b812442006dd9 100644
(file)
--- a/
src/html/helpdata.cpp
+++ b/
src/html/helpdata.cpp
@@
-475,11
+475,10
@@
void wxHtmlHelpData::SetTempDir(const wxString& path)
m_tempPath = path;
else
{
m_tempPath = path;
else
{
-
if (wxIsAbsolutePath(path)) m_tempPath = path
;
-
else m_tempPath = wxGetCwd() + wxT("/") + path
;
+
wxFileName fn(path)
;
+
fn.MakeAbsolute()
;
- if (m_tempPath[m_tempPath.length() - 1] != wxT('/'))
- m_tempPath << wxT('/');
+ m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);
}
}
}
}
@@
-569,7
+568,6
@@
bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
// Now store the contents range
bookr->SetContentsRange(cont_start, m_contents.size());
// Now store the contents range
bookr->SetContentsRange(cont_start, m_contents.size());
-#if wxUSE_WCHAR_T
// MS HTML Help files [written by MS HTML Help Workshop] are broken
// in that the data are iso-8859-1 (including HTML entities), but must
// be interpreted as being in language's windows charset. Correct the
// MS HTML Help files [written by MS HTML Help Workshop] are broken
// in that the data are iso-8859-1 (including HTML entities), but must
// be interpreted as being in language's windows charset. Correct the
@@
-597,11
+595,6
@@
bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
}
#undef CORRECT_STR
}
}
#undef CORRECT_STR
}
-#else
- wxUnusedVar(IndexOld);
- wxUnusedVar(ContentsOld);
- wxASSERT_MSG(encoding == wxFONTENCODING_SYSTEM, wxT("Help files need charset conversion, but wxUSE_WCHAR_T is 0"));
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
m_bookRecords.Add(bookr);
if (!m_index.empty())
m_bookRecords.Add(bookr);
if (!m_index.empty())
@@
-714,9
+707,9
@@
wxString wxHtmlHelpData::FindPageByName(const wxString& x)
break;
}
}
break;
}
}
-
+
int cnt = m_bookRecords.GetCount();
int cnt = m_bookRecords.GetCount();
-
+
if (!has_non_ascii)
{
wxFileSystem fsys;
if (!has_non_ascii)
{
wxFileSystem fsys;