reverted last commit, still broken for VC6

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

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index 8de443a243dcd05e9d3408b8e25bdee058f1f61a..2b7e2cf2b8ab46892bedae68e8f6fcc2d4a32cb5 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -6,10 +6,10 @@
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "helpbest.h"
 #endif
 
 #pragma implementation "helpbest.h"
 #endif
 


@@ -25,13 +25,16 @@
 #endif
 
 #include "wx/filefn.h"
 #endif
 
 #include "wx/filefn.h"

+#include "wx/log.h"
+
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+    && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)

 
 

-#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"
 
 #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 )
 {
 
 bool wxBestHelpController::Initialize( const wxString& filename )
 {


@@ -45,7 +48,7 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;

-        return TRUE;
+        return true;

     }
 
     // failed
     }
 
     // failed


@@ -58,13 +61,13 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;

-        return TRUE;
+        return true;

     }
 
     // failed
     delete html;
 
     }
 
     // failed
     delete html;
 

-    return FALSE;
+    return false;

 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const


@@ -74,28 +77,28 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
 
     switch( m_helpControllerType )
     {
 
     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( "wxBestHelpController: Must call Initialize, first!" );
-        return wxEmptyString;
-        break;
+        case wxUseChmHelp:
+            if( ::wxFileExists( tmp + wxT(".chm") ) )
+                return tmp + wxT(".chm");
+
+            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");
+
+            return filename;
+
+        default:
+            // we CAN'T get here
+            wxFAIL_MSG( wxT("wxBestHelpController: Must call Initialize, first!") );

     }
     }

+
+    return wxEmptyString;

 }
 
 #endif
 }
 
 #endif