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/wxPython/demo/bitmaps/.cvsignore
+++ b/wxPython/demo/bitmaps/.cvsignore
@@ -0,0 +1 @@
+new.bmp.test
--- a/wxPython/demo/bitmaps/01c.gif
+++ b/wxPython/demo/bitmaps/01c.gif
--- a/wxPython/demo/bitmaps/10s.gif
+++ b/wxPython/demo/bitmaps/10s.gif
--- a/wxPython/demo/bitmaps/12h.gif
+++ b/wxPython/demo/bitmaps/12h.gif
--- a/wxPython/demo/bitmaps/13d.gif
+++ b/wxPython/demo/bitmaps/13d.gif
--- a/wxPython/demo/bitmaps/Calend.bmp
+++ b/wxPython/demo/bitmaps/Calend.bmp
--- a/wxPython/demo/bitmaps/DbDec.bmp
+++ b/wxPython/demo/bitmaps/DbDec.bmp
--- a/wxPython/demo/bitmaps/DbInc.bmp
+++ b/wxPython/demo/bitmaps/DbInc.bmp
--- a/wxPython/demo/bitmaps/Dec.bmp
+++ b/wxPython/demo/bitmaps/Dec.bmp
--- a/wxPython/demo/bitmaps/Inc.bmp
+++ b/wxPython/demo/bitmaps/Inc.bmp
--- a/wxPython/demo/bitmaps/Pt.bmp
+++ b/wxPython/demo/bitmaps/Pt.bmp
--- a/wxPython/demo/bitmaps/backgrnd.png
+++ b/wxPython/demo/bitmaps/backgrnd.png
--- a/wxPython/demo/bitmaps/copy.bmp
+++ b/wxPython/demo/bitmaps/copy.bmp
--- a/wxPython/demo/bitmaps/image.bmp
+++ b/wxPython/demo/bitmaps/image.bmp
--- a/wxPython/demo/bitmaps/image.gif
+++ b/wxPython/demo/bitmaps/image.gif
--- a/wxPython/demo/bitmaps/image.jpg
+++ b/wxPython/demo/bitmaps/image.jpg
--- a/wxPython/demo/bitmaps/image.png
+++ b/wxPython/demo/bitmaps/image.png
--- a/wxPython/demo/bitmaps/lb1.bmp
+++ b/wxPython/demo/bitmaps/lb1.bmp
--- a/wxPython/demo/bitmaps/lb2.bmp
+++ b/wxPython/demo/bitmaps/lb2.bmp
--- a/wxPython/demo/bitmaps/mondrian.ico
+++ b/wxPython/demo/bitmaps/mondrian.ico
--- a/wxPython/demo/bitmaps/new.bmp
+++ b/wxPython/demo/bitmaps/new.bmp
--- a/wxPython/demo/bitmaps/open.bmp
+++ b/wxPython/demo/bitmaps/open.bmp
--- a/wxPython/demo/bitmaps/paste.bmp
+++ b/wxPython/demo/bitmaps/paste.bmp
--- a/wxPython/demo/bitmaps/smiles.bmp
+++ b/wxPython/demo/bitmaps/smiles.bmp
--- a/wxPython/demo/bitmaps/smiles.ico
+++ b/wxPython/demo/bitmaps/smiles.ico
--- a/wxPython/demo/bitmaps/splash.gif
+++ b/wxPython/demo/bitmaps/splash.gif
--- a/wxPython/demo/bitmaps/test2.bmp
+++ b/wxPython/demo/bitmaps/test2.bmp
--- a/wxPython/demo/bitmaps/test_image.png
+++ b/wxPython/demo/bitmaps/test_image.png
--- a/wxPython/demo/bitmaps/test_mask.bmp
+++ b/wxPython/demo/bitmaps/test_mask.bmp
--- a/wxPython/demo/bitmaps/tog1.bmp
+++ b/wxPython/demo/bitmaps/tog1.bmp
--- a/wxPython/demo/bitmaps/tog2.bmp
+++ b/wxPython/demo/bitmaps/tog2.bmp