fixed a few VC++ warnings (release mode only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1f1a42a63c
commit
c34bed1413
@ -74,27 +74,26 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
|
|||||||
|
|
||||||
switch( m_helpControllerType )
|
switch( m_helpControllerType )
|
||||||
{
|
{
|
||||||
case wxUseChmHelp:
|
case wxUseChmHelp:
|
||||||
if( ::wxFileExists( tmp + ".chm" ) )
|
if( ::wxFileExists( tmp + ".chm" ) )
|
||||||
return tmp + ".chm";
|
return tmp + ".chm";
|
||||||
|
|
||||||
return filename;
|
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;
|
case wxUseHtmlHelp:
|
||||||
break;
|
if( ::wxFileExists( tmp + ".htb" ) )
|
||||||
default:
|
return tmp + ".htb";
|
||||||
// we CAN'T get here
|
if( ::wxFileExists( tmp + ".zip" ) )
|
||||||
wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
|
return tmp + ".zip";
|
||||||
return wxEmptyString;
|
if( ::wxFileExists( tmp + ".hhp" ) )
|
||||||
break;
|
return tmp + ".hhp";
|
||||||
|
|
||||||
|
return filename;
|
||||||
|
|
||||||
|
default:
|
||||||
|
// we CAN'T get here
|
||||||
|
wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
|
||||||
|
return wxEmptyString;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user