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

@@ -15,7 +15,7 @@ passed {\bf string}. See the example:
mywin -> LoadPage("test.htm");
mywin -> SetPage("<html><body>"
"<h1>Error</h1>"
"Some error occured :-H)"
"Some error occurred :-H)"
"</body></hmtl>");
\end{verbatim}
@@ -43,7 +43,7 @@ See the example:
html -> SetRelatedStatusBar(0);
\end{verbatim}
The first command associates html object with it's parent frame
The first command associates html object with it is parent frame
(this points to wxFrame object there) and sets format of title.
Page title "Hello, world!" will be displayed as "HTML : Hello, world!"
in this example.