X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e0201eaa1e299cb5c37246324464e6e2dce7584..c17ba76f38f7ef27a8a8f3710727a365e9c23de1:/include/wx/generic/helphtml.h

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 6bf25dff3e..8e81689988 100644
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -11,25 +11,21 @@
 
 #if wxUSE_HELP
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #   pragma interface "helphtml.h"
 #endif
 
 #include "wx/helpbase.h"
 #include "wx/frame.h"
 
-/// Name for map file.
-#define WXEXTHELP_MAPFILE   "wxhelp.map"
 /// Path separator.
 #ifdef __WXMSW__
-#define WXEXTHELP_SEPARATOR '\\'
+#define WXEXTHELP_SEPARATOR _T('\\')
+#elif defined(__WXMAC__)
+#define WXEXTHELP_SEPARATOR _T(':')
 #else
-#define WXEXTHELP_SEPARATOR '/'
+#define WXEXTHELP_SEPARATOR _T('/')
 #endif
-/// Maximum line length in map file.
-#define WXEXTHELP_BUFLEN 512
-/// Character introducing comments/documentation field in map file.
-#define WXEXTHELP_COMMENTCHAR   ';'
 
 class WXDLLEXPORT wxExtHelpMapList;
 
@@ -90,7 +86,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
        @file Name of help directory.
        @return true on success
    */
-   virtual bool LoadFile(const wxString& file = "");
+   virtual bool LoadFile(const wxString& file = wxT(""));
 
    /** Display list of all help entries.
        @return true on success
@@ -103,6 +99,10 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    /** Display help for id sectionNo -- identical with DisplaySection().
        @return true on success
    */
+   virtual bool DisplaySection(const wxString& section);
+   /** Display help for URL (using DisplayHelp) or keyword (using KeywordSearch)
+       @return true on success
+   */
    virtual bool DisplayBlock(long blockNo);
    /** Search comment/documentation fields in map file and present a
        list to chose from.
@@ -117,7 +117,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    virtual void OnQuit(void);
 
    /// Call the browser using a relative URL.
-   virtual bool DisplayHelp(wxString const &) = 0;
+   virtual bool DisplayHelp(const wxString &) = 0;
 
    /// Allows one to override the default settings for the help frame.
    virtual void SetFrameParameters(const wxString& WXUNUSED(title),