Add "inherit" to <font> XRC tag.

[wxWidgets.git] / interface / wx / generic / helpext.h

diff --git a/interface/wx/generic/helpext.h b/interface/wx/generic/helpext.h
index d20394405d6146b8b1635ba3cbe9a713f46bb8bd..b44be1dd0fd4206621db491a6053d738d8d7fb31 100644 (file)
--- a/interface/wx/generic/helpext.h
+++ b/interface/wx/generic/helpext.h
@@ -32,7 +32,7 @@
 
     @see wxHelpController
 */
-class wxExtHelpController : public wxHelpController
+class wxExtHelpController : public wxHelpControllerBase
 {
 public:
     wxExtHelpController(wxWindow* parentWindow = NULL);
@@ -83,7 +83,7 @@ public:
 
         @return @true on success
     */
-    virtual bool DisplayContents(void);
+    virtual bool DisplayContents();
 
     /**
         Display help for id sectionNo.
@@ -135,7 +135,7 @@ public:
     /**
         Call the browser using a relative URL.
     */
-    virtual bool DisplayHelp(const wxString &) ;
+    virtual bool DisplayHelp(const wxString& relativeURL) ;
 
     /**
         Allows one to override the default settings for the help frame.