Add wxAnyScrollHelperBase to reduce code duplication in wxVarScrollHelperBase.

[wxWidgets.git] / src / msw / helpbest.cpp

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index 3782a29354e8901a7c5f9b7ee603564a9e971017..f9f811c6b9d95c2ea28301d992b03fa966b912e3 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -4,7 +4,6 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     02/04/2001
-// RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,7 +19,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__)
@@ -51,7 +50,8 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     delete chm;
 
     // try wxHtmlHelpController
-    wxHtmlHelpController* html = new wxHtmlHelpController(wxHF_DEFAULT_STYLE, m_parentWindow);
+    wxHtmlHelpController *
+        html = new wxHtmlHelpController(m_style, m_parentWindow);
 
     m_helpControllerType = wxUseHtmlHelp;
     if( html->Initialize( GetValidFilename( filename ) ) )
@@ -69,24 +69,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;