Small warning fixes.

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

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index a507852e1e5ebcc66de5fff9179e1e46f7a0d85e..464ea1025a502d15319d2f51974dc1c962c37556 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

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

 #pragma implementation "helpwin.h"
 #endif
 
 #pragma implementation "helpwin.h"
 #endif
 


@@ -50,22 +50,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 bool wxWinHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
 bool wxWinHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;
 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::DisplayContents(void)
 {
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
     wxString str = GetValidFilename(m_helpFile);

-    
+

 #if defined(__WIN95__)
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0);
 #else
 #if defined(__WIN95__)
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0);
 #else


@@ -76,8 +76,8 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);
     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);


@@ -85,8 +85,8 @@ bool wxWinHelpController::DisplaySection(int section)
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);


@@ -95,15 +95,16 @@ bool wxWinHelpController::DisplayContextPopup(int contextId)
 bool wxWinHelpController::DisplayBlock(long block)
 {
     DisplaySection(block);
 bool wxWinHelpController::DisplayBlock(long block)
 {
     DisplaySection(block);

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxWinHelpController::KeywordSearch(const wxString& k)
+bool wxWinHelpController::KeywordSearch(const wxString& k,
+                                        wxHelpSearchMode WXUNUSED(mode))

 {
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
     wxString str = GetValidFilename(m_helpFile);

-    
+

     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
 }
 
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
 }