// Created: 02/04/2001
// RCS-ID: $Id$
// Copyright: (c) Mattia Barbon
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "helpbest.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/filefn.h"
#include "wx/log.h"
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+ && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
+
#include "wx/msw/helpchm.h"
#include "wx/html/helpctrl.h"
#include "wx/msw/helpbest.h"
-IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase );
+IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase )
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;
- return TRUE;
+ m_parentWindow = NULL;
+ return true;
}
// failed
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;
- return TRUE;
+ m_parentWindow = NULL;
+ return true;
}
// failed
delete html;
- return FALSE;
+ return false;
}
wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
switch( m_helpControllerType )
{
case wxUseChmHelp:
- if( ::wxFileExists( tmp + ".chm" ) )
- return tmp + ".chm";
+ if( ::wxFileExists( tmp + wxT(".chm") ) )
+ return tmp + wxT(".chm");
return filename;
case wxUseHtmlHelp:
- if( ::wxFileExists( tmp + ".htb" ) )
- return tmp + ".htb";
- if( ::wxFileExists( tmp + ".zip" ) )
- return tmp + ".zip";
- if( ::wxFileExists( tmp + ".hhp" ) )
- return tmp + ".hhp";
+ if( ::wxFileExists( tmp + wxT(".htb") ) )
+ return tmp + wxT(".htb");
+ if( ::wxFileExists( tmp + wxT(".zip") ) )
+ return tmp + wxT(".zip");
+ if( ::wxFileExists( tmp + wxT(".hhp") ) )
+ return tmp + wxT(".hhp");
return filename;
default:
// we CAN'T get here
wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
- return wxEmptyString;
}
+
+ return wxEmptyString;
}
#endif