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/contrib/docs/latex/ogl/back.gif
+++ b/contrib/docs/latex/ogl/back.gif
--- a/contrib/docs/latex/ogl/contents.gif
+++ b/contrib/docs/latex/ogl/contents.gif
--- a/contrib/docs/latex/ogl/forward.gif
+++ b/contrib/docs/latex/ogl/forward.gif
--- a/contrib/docs/latex/ogl/ogl.hpj
+++ b/contrib/docs/latex/ogl/ogl.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxwind~1\docs\latex\ogl ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxwind~1\contrib\docs\latex\ogl ; Assume that bitmaps are where the source is
 TITLE=OGL Manual
 CONTENTS=Contents
 COMPRESS=HIGH
--- a/contrib/docs/latex/ogl/up.gif
+++ b/contrib/docs/latex/ogl/up.gif