/////////////////////////////////////////////////////////////////////////////
-// Name: helpbest.cpp
+// Name: src/msw/helpbest.cpp
// Purpose: Tries to load MS HTML Help, falls back to wxHTML upon failure
// Author: Mattia Barbon
// Modified by:
#endif
#ifndef WX_PRECOMP
-#include "wx/defs.h"
+ #include "wx/log.h"
#endif
#include "wx/filefn.h"
-#include "wx/log.h"
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP \
&& wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
#include "wx/msw/helpchm.h"
bool wxBestHelpController::Initialize( const wxString& filename )
{
// try wxCHMHelpController
- wxCHMHelpController* chm = new wxCHMHelpController;
+ wxCHMHelpController* chm = new wxCHMHelpController(m_parentWindow);
m_helpControllerType = wxUseChmHelp;
// do not warn upon failure
if( chm->Initialize( GetValidFilename( filename ) ) )
{
m_helpController = chm;
+ m_parentWindow = NULL;
return true;
}
delete chm;
// try wxHtmlHelpController
- wxHtmlHelpController* html = new wxHtmlHelpController;
+ wxHtmlHelpController* html = new wxHtmlHelpController(wxHF_DEFAULT_STYLE, m_parentWindow);
m_helpControllerType = wxUseHtmlHelp;
if( html->Initialize( GetValidFilename( filename ) ) )
{
m_helpController = html;
+ m_parentWindow = NULL;
return true;
}
}
#endif
- // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+ // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP