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/variant.tex
+++ b/docs/latex/wx/variant.tex
@@ -45,7 +45,8 @@ Default constructor.

 Copy constructor.

-\func{}{wxVariant}{\param{const char*}{ value}, \param{const wxString\& }{name = ``"}}\\
+\func{}{wxVariant}{\param{const char*}{ value}, \param{const wxString\& }{name = ``"}}
+
 \func{}{wxVariant}{\param{const wxString\&}{ value}, \param{const wxString\& }{name = ``"}}

 Construction from a string value.