projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warning fixes.
[wxWidgets.git]
/
src
/
msw
/
helpbest.cpp
diff --git
a/src/msw/helpbest.cpp
b/src/msw/helpbest.cpp
index be1e404cdea4a2e899c3189a5118632845cebcdf..2b7e2cf2b8ab46892bedae68e8f6fcc2d4a32cb5 100644
(file)
--- 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
// Created: 02/04/2001
// RCS-ID: $Id$
// Copyright: (c) Mattia Barbon
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@
-27,7
+27,9
@@
#include "wx/filefn.h"
#include "wx/log.h"
#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"
#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;
if( chm->Initialize( GetValidFilename( filename ) ) )
{
m_helpController = chm;
- return
TRUE
;
+ return
true
;
}
// failed
}
// failed
@@
-59,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