merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/latex/wx/semaphor.tex

@@ -60,7 +60,7 @@ Destructor is not virtual, don't use this class polymorphically.
 \func{wxSemaError }{Post}{\void}
 
 Increments the semaphore count and signals one of the waiting
-threads in an atomic way. Returns wxSEMA_OVERFLOW if the count
+threads in an atomic way. Returns wxSEMA\_OVERFLOW if the count
 would increase the counter past the maximum.
 
 \wxheading{Return value}