Applied [ 1059554 ] patch for [1028659] fixes a couple of bugs with menus

[wxWidgets.git] / src / mac / carbon / helpxxxx.cpp

diff --git a/src/mac/carbon/helpxxxx.cpp b/src/mac/carbon/helpxxxx.cpp
index 086762c6462598ee2843740606907910b37c451e..e330ce2d7981a4546a1a9b481eadcc7c572390d9 100644 (file)
--- a/src/mac/carbon/helpxxxx.cpp
+++ b/src/mac/carbon/helpxxxx.cpp
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpxxxx.cpp
 // Purpose:     Help system: native implementation
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "helpxxxx.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/stubs/helpxxxx.h"
 
 #include <string.h>
@@ -47,7 +49,7 @@ bool wxXXXXHelpController::LoadFile(const wxString& file)
 bool wxXXXXHelpController::DisplayContents()
 {
     // TODO
-       return FALSE;
+    return FALSE;
 }
 
 bool wxXXXXHelpController::DisplaySection(int section)
@@ -62,7 +64,8 @@ bool wxXXXXHelpController::DisplayBlock(long block)
     return FALSE;
 }
 
-bool wxXXXXHelpController::KeywordSearch(const wxString& k)
+bool wxXXXXHelpController::KeywordSearch(const wxString& k,
+                                         wxHelpSearchMode WXUNUSED(mode))
 {
     if (m_helpFile == "") return FALSE;