merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/helpxlp.h

@@ -104,6 +104,11 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
   virtual bool DisplayBlock(long blockNo);
   virtual bool KeywordSearch(const wxString& k);
 
+  virtual bool DisplaySection(const wxString& section)
+  {
+      return wxHelpControllerBase::DisplaySection(section);
+  }
+
   virtual bool Quit(void);
   virtual void OnQuit(void);