Simplify and rationalize wxGDIPlusContext class constructors.

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

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index cb69551e1a105f61c3688993c9137c7fb28ef8a1..997655790c019cae1bbb7a523799c3b281a3a783 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -17,11 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/filefn.h"
-#include "wx/log.h"
+#include "wx/filename.h"

 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP \
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP \
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)


@@ -52,7 +51,8 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     delete chm;
 
     // try wxHtmlHelpController
     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 ) ) )
 
     m_helpControllerType = wxUseHtmlHelp;
     if( html->Initialize( GetValidFilename( filename ) ) )


@@ -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;
-    ::wxStripExtension( tmp );
+    wxFileName fn(filename);

 
     switch( m_helpControllerType )
     {
         case wxUseChmHelp:
 
     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:
 
             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;
 
 
             return filename;