projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected content vs structure calculation
[wxWidgets.git]
/
src
/
html
/
helpctrl.cpp
diff --git
a/src/html/helpctrl.cpp
b/src/html/helpctrl.cpp
index 9f1de8e4098bcf27f3ec3fc61ce76c958210b6b3..5f0bc3fd68e44db3555a3f40bc13e88cb4953547 100644
(file)
--- a/
src/html/helpctrl.cpp
+++ b/
src/html/helpctrl.cpp
@@
-38,6
+38,12
@@
#if wxUSE_HELP
#include "wx/tipwin.h"
#endif
#if wxUSE_HELP
#include "wx/tipwin.h"
#endif
+
+
+#if wxUSE_LIBMSPACK
+#include "wx/html/forcelnk.h"
+FORCE_LINK(wxhtml_chm_support)
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
@@
-142,6
+148,7
@@
void wxHtmlHelpController::CreateHelpWindow()
m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
m_helpFrame->SetTitleFormat(m_titleFormat);
m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
m_helpFrame->SetTitleFormat(m_titleFormat);
+
m_helpFrame->Show(TRUE);
}
m_helpFrame->Show(TRUE);
}
@@
-187,10
+194,15
@@
bool wxHtmlHelpController::Initialize(const wxString& file)
{
actualFilename = dir + filename + wxString(wxT(".hhp"));
if (!wxFileExists(actualFilename))
{
actualFilename = dir + filename + wxString(wxT(".hhp"));
if (!wxFileExists(actualFilename))
- return FALSE;
+ {
+#if wxUSE_LIBMSPACK
+ actualFilename = dir + filename + wxString(wxT(".chm"));
+ if (!wxFileExists(actualFilename))
+#endif
+ return false;
+ }
}
}
}
}
-
return AddBook(wxFileName(actualFilename));
}
return AddBook(wxFileName(actualFilename));
}