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/mutexlck.tex
+++ b/docs/latex/wx/mutexlck.tex
@@ -25,7 +25,7 @@ None.

 \func{}{wxMutexLocker}{\param{wxMutex *}{mutex}}

-Constructs a wxMutexLocker object associated with mutex which must be non NULL
+Constructs a wxMutexLocker object associated with mutex which must be non-NULL
 and locks it. Call \helpref{IsLocked}{wxmutexlockerisok} to check if the mutex was
 successfully locked.