merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -127,7 +127,7 @@ htmlwin -> SetPage("help/myproject/index.htm");
\wxheading{Return value}
FALSE if an error occured, TRUE otherwise
FALSE if an error occurred, TRUE otherwise
\membersection{wxHtmlWindow::OnLinkClicked}\label{wxhtmlwindowonlinkclicked}
@@ -230,7 +230,7 @@ If you want to load a document from some location use
\wxheading{Return value}
FALSE if an error occured, TRUE otherwise.
FALSE if an error occurred, TRUE otherwise.
\membersection{wxHtmlWindow::SetRelatedFrame}\label{wxhtmlwindowsetrelatedframe}