From: Francesco Montorsi <f18m_cpp217828@yahoo.it> Date: Wed, 7 Jan 2009 01:04:01 +0000 (+0000) Subject: use wxFileName instead of ::wxStripExtension X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6ad43fc3d159a5aa6d52af3c00d88f9f84aa1605 use wxFileName instead of ::wxStripExtension git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index 3605ea3dac..997655790c 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -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;