Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index ec408ee30ed67b4c1b586a4dea06ed9c00485482..01667e799c674d03a7e979d029260f276162db3a 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/filefn.h"
+#include "wx/log.h"
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
 #include "wx/msw/helpchm.h"
@@ -74,28 +75,28 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
 
     switch( m_helpControllerType )
     {
-    case wxUseChmHelp:
-        if( ::wxFileExists( tmp + ".chm" ) )
-            return tmp + ".chm";
-
-        return filename;
-        break;
-    case wxUseHtmlHelp:
-        if( ::wxFileExists( tmp + ".htb" ) )
-            return tmp + ".htb";
-        if( ::wxFileExists( tmp + ".zip" ) )
-            return tmp + ".zip";
-        if( ::wxFileExists( tmp + ".hhp" ) )
-            return tmp + ".hhp";
-
-        return filename;
-        break;
-    default:
-        // we CAN'T get here
-        wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
-        return wxEmptyString;
-        break;
+        case wxUseChmHelp:
+            if( ::wxFileExists( tmp + ".chm" ) )
+                return tmp + ".chm";
+
+            return filename;
+
+        case wxUseHtmlHelp:
+            if( ::wxFileExists( tmp + ".htb" ) )
+                return tmp + ".htb";
+            if( ::wxFileExists( tmp + ".zip" ) )
+                return tmp + ".zip";
+            if( ::wxFileExists( tmp + ".hhp" ) )
+                return tmp + ".hhp";
+
+            return filename;
+
+        default:
+            // we CAN'T get here
+            wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
     }
+
+    return wxEmptyString;
 }
 
 #endif