X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/msw/helpbest.cpp diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index be1e404cde..3605ea3dac 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: // Created: 02/04/2001 // RCS-ID: $Id$ // Copyright: (c) Mattia Barbon -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "helpbest.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,13 +17,14 @@ #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__) && wxUSE_WXHTML_HELP +#if wxUSE_HELP && wxUSE_MS_HTML_HELP \ + && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) + #include "wx/msw/helpchm.h" #include "wx/html/helpctrl.h" #include "wx/msw/helpbest.h" @@ -37,7 +34,7 @@ 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 @@ -46,26 +43,29 @@ bool wxBestHelpController::Initialize( const wxString& filename ) 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(m_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 @@ -100,4 +100,4 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons } #endif - // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP + // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP