Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxFileName instead of ::wxStripExtension

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-07 01:04:01 +00:00
parent a51e601e17
commit 6ad43fc3d1
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/helpbest.cpp
View File

@@ -20,7 +20,7 @@
#include "wx/log.h" #include "wx/log.h"
#endif #endif
#include "wx/filefn.h" #include "wx/filename.h"
#if wxUSE_HELP && wxUSE_MS_HTML_HELP \ #if wxUSE_HELP && wxUSE_MS_HTML_HELP \
&& wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
@@ -70,24 +70,29 @@ bool wxBestHelpController::Initialize( const wxString& filename )
wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
{ {
wxString tmp = filename; wxFileName fn(filename);
::wxStripExtension( tmp );
switch( m_helpControllerType ) switch( m_helpControllerType )
{ {
case wxUseChmHelp: case wxUseChmHelp:
if( ::wxFileExists( tmp + wxT(".chm") ) ) fn.SetExt("chm");
return tmp + wxT(".chm"); if( fn.FileExists() )
return fn.GetFullPath();
return filename; return filename;
case wxUseHtmlHelp: case wxUseHtmlHelp:
if( ::wxFileExists( tmp + wxT(".htb") ) ) fn.SetExt("htb");
return tmp + wxT(".htb"); if( fn.FileExists() )
if( ::wxFileExists( tmp + wxT(".zip") ) ) return fn.GetFullPath();
return tmp + wxT(".zip");
if( ::wxFileExists( tmp + wxT(".hhp") ) ) fn.SetExt("zip");
return tmp + wxT(".hhp"); if( fn.FileExists() )
return fn.GetFullPath();
fn.SetExt("hhp");
if( fn.FileExists() )
return fn.GetFullPath();
return filename; return filename;