wxCocoa: Better icon support

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

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index 3c8df8327a528fc0a73150e2353150286524a6ab..be1e404cdea4a2e899c3189a5118632845cebcdf 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "helpbest.h"
 #endif
 
@@ -25,13 +25,14 @@
 #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"
 #include "wx/html/helpctrl.h"
 #include "wx/msw/helpbest.h"
 
-IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase );
+IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase )
 
 bool wxBestHelpController::Initialize( const wxString& filename )
 {
@@ -75,26 +76,27 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
     switch( m_helpControllerType )
     {
         case wxUseChmHelp:
-            if( ::wxFileExists( tmp + ".chm" ) )
-                return tmp + ".chm";
+            if( ::wxFileExists( tmp + wxT(".chm") ) )
+                return tmp + wxT(".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";
+            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");
 
             return filename;
 
         default:
             // we CAN'T get here
             wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );
-            return wxEmptyString;
     }
+
+    return wxEmptyString;
 }
 
 #endif