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/docs/latex/wx/dir.tex
+++ b/docs/latex/wx/dir.tex
@@ -94,7 +94,7 @@ class is not meant to be used polymorphically.
 \func{bool}{Open}{\param{const wxString\& }{dir}}

 Open the directory for enumerating, returns TRUE on success or FALSE if an
-error occured.
+error occurred.

 \membersection{wxDir::IsOpened}\label{wxdirisopened}