merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -74,7 +74,7 @@ DECLARE_CLASS(wxExtHelpController)
   /// Is the viewer a variant of netscape?
   bool             m_BrowserIsNetscape;
   /// Call the browser using a relative URL.
-   virtual bool DisplayHelp(wxString const &);
+   virtual bool DisplayHelp(const wxString&);
 };

 #endif // wxUSE_HELP