use wxFileName instead of ::wxStripExtension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
#include "wx/log.h"
|
||||
#endif
|
||||
|
||||
#include "wx/filefn.h"
|
||||
#include "wx/filename.h"
|
||||
|
||||
#if wxUSE_HELP && wxUSE_MS_HTML_HELP \
|
||||
&& wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
|
||||
@@ -70,24 +70,29 @@ bool wxBestHelpController::Initialize( const wxString& filename )
|
||||
|
||||
wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
|
||||
{
|
||||
wxString tmp = filename;
|
||||
::wxStripExtension( tmp );
|
||||
wxFileName fn(filename);
|
||||
|
||||
switch( m_helpControllerType )
|
||||
{
|
||||
case wxUseChmHelp:
|
||||
if( ::wxFileExists( tmp + wxT(".chm") ) )
|
||||
return tmp + wxT(".chm");
|
||||
fn.SetExt("chm");
|
||||
if( fn.FileExists() )
|
||||
return fn.GetFullPath();
|
||||
|
||||
return filename;
|
||||
|
||||
case wxUseHtmlHelp:
|
||||
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");
|
||||
fn.SetExt("htb");
|
||||
if( fn.FileExists() )
|
||||
return fn.GetFullPath();
|
||||
|
||||
fn.SetExt("zip");
|
||||
if( fn.FileExists() )
|
||||
return fn.GetFullPath();
|
||||
|
||||
fn.SetExt("hhp");
|
||||
if( fn.FileExists() )
|
||||
return fn.GetFullPath();
|
||||
|
||||
return filename;
|
||||
|
||||
|
Reference in New Issue
Block a user