X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d285623a7a247e231a63dbba1ab5f8a9a0be90f..81c9effa8462662263c3b4eac2cfae1ef5caae2c:/src/msw/helpbest.cpp diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index 8de443a243..01667e799c 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -25,6 +25,7 @@ #endif #include "wx/filefn.h" +#include "wx/log.h" #if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP #include "wx/msw/helpchm.h" @@ -74,28 +75,28 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons switch( m_helpControllerType ) { - case wxUseChmHelp: - if( ::wxFileExists( tmp + ".chm" ) ) - return tmp + ".chm"; - - return filename; - break; - case wxUseHtmlHelp: - if( ::wxFileExists( tmp + ".htb" ) ) - return tmp + ".htb"; - if( ::wxFileExists( tmp + ".zip" ) ) - return tmp + ".zip"; - if( ::wxFileExists( tmp + ".hhp" ) ) - return tmp + ".hhp"; - - return filename; - break; - default: - // we CAN'T get here - wxFAIL_MSG( "wxBestHelpController: Must call Initialize, first!" ); - return wxEmptyString; - break; + case wxUseChmHelp: + if( ::wxFileExists( tmp + ".chm" ) ) + return tmp + ".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"; + + return filename; + + default: + // we CAN'T get here + wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") ); } + + return wxEmptyString; } #endif