X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c34bed1413be4972d22a622d1369d6d61e8433c9..1d6560d796aefb5dbdf217109767b1054c68c291:/src/msw/helpbest.cpp diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index 3c8df8327a..2b7e2cf2b8 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -6,10 +6,10 @@ // Created: 02/04/2001 // RCS-ID: $Id$ // Copyright: (c) Mattia Barbon -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "helpbest.h" #endif @@ -25,13 +25,16 @@ #endif #include "wx/filefn.h" +#include "wx/log.h" + +#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \ + && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) -#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP #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 ) { @@ -45,7 +48,7 @@ bool wxBestHelpController::Initialize( const wxString& filename ) if( chm->Initialize( GetValidFilename( filename ) ) ) { m_helpController = chm; - return TRUE; + return true; } // failed @@ -58,13 +61,13 @@ bool wxBestHelpController::Initialize( const wxString& filename ) if( html->Initialize( GetValidFilename( filename ) ) ) { m_helpController = html; - return TRUE; + return true; } // failed delete html; - return FALSE; + return false; } wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const @@ -75,26 +78,27 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons 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