X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..1d6560d796aefb5dbdf217109767b1054c68c291:/src/msw/helpbest.cpp?ds=inline diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp index be1e404cde..2b7e2cf2b8 100644 --- a/src/msw/helpbest.cpp +++ b/src/msw/helpbest.cpp @@ -6,7 +6,7 @@ // Created: 02/04/2001 // RCS-ID: $Id$ // Copyright: (c) Mattia Barbon -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) @@ -27,7 +27,9 @@ #include "wx/filefn.h" #include "wx/log.h" -#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP +#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \ + && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) + #include "wx/msw/helpchm.h" #include "wx/html/helpctrl.h" #include "wx/msw/helpbest.h" @@ -46,7 +48,7 @@ bool wxBestHelpController::Initialize( const wxString& filename ) if( chm->Initialize( GetValidFilename( filename ) ) ) { m_helpController = chm; - return TRUE; + return true; } // failed @@ -59,13 +61,13 @@ bool wxBestHelpController::Initialize( const wxString& filename ) if( html->Initialize( GetValidFilename( filename ) ) ) { m_helpController = html; - return TRUE; + return true; } // failed delete html; - return FALSE; + return false; } wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const