X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62cdd7d3f80a9a5ef48041695008bbdbf319e9c2..98af9c738332c9a24475ad19efbfabe2b152c429:/src/msw/helpbest.cpp diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index bb1aad5059..53244390bd 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -6,13 +6,9 @@ // 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" @@ -39,7 +35,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 @@ -48,26 +44,28 @@ 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(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