[Commits] (heikki) Bug 1472, upgrade to wxPython 2.5.2.9.

commits at osafoundation.org commits at osafoundation.org
Wed Sep 22 14:21:24 PDT 2004


Commit by: heikki
Modified files:
internal/wxPython-2.5/distrib/mac/pbsetup-sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/cocoa.rsp 1.1 2.1
internal/wxPython-2.5/distrib/msw/dmc.rsp 1.1 2.1
internal/wxPython-2.5/distrib/msw/makewinceproj.sh 1.1 2.1
internal/wxPython-2.5/distrib/msw/copy_src.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/cw.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/cw_mac.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/dsp2dos.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/generic.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/innobott.txt 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/innotop.txt 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/mac.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makeall.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makedist.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makefile.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makefile.vc 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makerpm 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/makesetup.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/maketarballs 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/msw.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/os2.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/setup.var 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/splitwise.cpp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tardist 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tardist.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tarmicrowin.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tarwxall 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tarwxmac 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tarwxmotif 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tarwxx11 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tex2rtf.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/unix2dos.c 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/utils.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/vc.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/wince.rsp 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/zipdist.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/zipmac.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/zippatch.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/zipwinminimal.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/zipxml.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/b32.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/b32base.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/base.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/basevc.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/bcc.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/dos.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/filelist.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/filelist.txt 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/g95.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/gtk.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/mac.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/makeall.bat 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/makeall.sh 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/mgl.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/micro.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/motif.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/msw.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/os2.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/sc.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/tmake.conf 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/univ.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/v15.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/vc.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/vc6app.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/vc6base.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/wat.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/watbase.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/watmgl.t 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro 2.1.5.1 2.2
internal/wxPython-2.5/distrib/msw/tmake/x11.t 2.1.5.1 2.2
internal/wxPython-2.5/docs/changes.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/index.htm 2.1.5.1 2.2
internal/wxPython-2.5/docs/preamble.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/readme_vms.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/toback24.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/todo30.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/base/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/cocoa/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/cocoa/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/gtk/changes.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/gtk/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/gtk/licence.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/gtk/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/SetTypeFromExtension 1.1 2.1
internal/wxPython-2.5/docs/mac/SetXMLCreator.applescript 1.1 2.1
internal/wxPython-2.5/docs/mac/ansi.diff 1.1 2.1
internal/wxPython-2.5/docs/mac/M5build.applescript 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M5converteol.sh 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M5replace.sh 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/mac/SetTypeFromExtension.sea.hqx 2.1.5.1 None
internal/wxPython-2.5/docs/mgl/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/mgl/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/microwin/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/motif/aix.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/motif/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/motif/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/issues.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/winxp.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/wince/guidelines.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/msw/wince/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/os2/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/publicity/announce.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/publicity/publicity.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/publicity/slogans.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0018.txt 1.1 2.1
internal/wxPython-2.5/docs/tech/index.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0001.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0002.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0003.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0004.htm 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0005.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0007.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0008.htm 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0009.htm 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0010.htm 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0011.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0012.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0013.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0014.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0015.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0016.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/tech/tn0017.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/univ/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/wine/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/wine/licence.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/wine/readme.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/x11/install.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/x11/readme-nanox.txt 2.1.5.1 2.2
internal/wxPython-2.5/docs/x11/readme.txt 2.1.5.1 2.2

Log message:
Bug 1472, upgrade to wxPython 2.5.2.9.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/mac/pbsetup-sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/cocoa.rsp.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/dmc.rsp.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makewinceproj.sh.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/copy_src.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/cw.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/cw_mac.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/dsp2dos.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/generic.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/innobott.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/innotop.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/mac.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makeall.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makedist.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makefile.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makefile.vc.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makerpm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/makesetup.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/maketarballs.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/msw.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/os2.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/setup.var.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/splitwise.cpp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tardist.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tardist.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tarmicrowin.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tarwxall.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tarwxmac.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tarwxmotif.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tarwxx11.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tex2rtf.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/unix2dos.c.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/utils.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/vc.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/wince.rsp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/zipdist.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/zipmac.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/zippatch.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/zipwinminimal.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/zipxml.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/b32.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/b32base.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/base.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/basevc.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/bcc.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/dos.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/filelist.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/filelist.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/g95.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/gtk.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/mac.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/makeall.bat.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/makeall.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/mgl.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/micro.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/motif.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/msw.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/os2.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/sc.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/tmake.conf.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/univ.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/v15.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/vc.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/vc6app.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/vc6base.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/wat.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/watbase.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/watmgl.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/distrib/msw/tmake/x11.t.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/changes.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/index.htm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/preamble.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/readme_vms.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/toback24.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/todo30.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/base/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/cocoa/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/cocoa/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/gtk/changes.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/gtk/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/gtk/licence.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/gtk/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/SetTypeFromExtension.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/SetXMLCreator.applescript.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/ansi.diff.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M5build.applescript.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M5converteol.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M5replace.sh.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mac/SetTypeFromExtension.sea.hqx.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mgl/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/mgl/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/microwin/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/motif/aix.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/motif/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/motif/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/issues.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/winxp.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/wince/guidelines.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/msw/wince/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/os2/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/publicity/announce.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/publicity/publicity.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/publicity/slogans.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0018.txt.diff?r1=text&tr1=1.1&r2=text&tr2=2.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/index.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0001.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0002.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0003.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0004.htm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0005.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0007.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0008.htm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0009.htm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0010.htm.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0011.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0012.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0013.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0014.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0015.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0016.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/tech/tn0017.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/univ/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/wine/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/wine/licence.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/wine/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/x11/install.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/x11/readme-nanox.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/docs/x11/readme.txt.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2


Index: internal/wxPython-2.5/docs/readme_vms.txt
diff -u internal/wxPython-2.5/docs/readme_vms.txt:2.1.5.1 internal/wxPython-2.5/docs/readme_vms.txt:2.2
--- internal/wxPython-2.5/docs/readme_vms.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/readme_vms.txt	Wed Sep 22 14:21:04 2004
@@ -9,7 +9,7 @@
     -GTK1.2.8 (for wxGTK)
     
 To get everything compiled you'll need to have installed prior to compiling
-wxWindows:
+wxWidgets:
     -Bison
       get it from http://www.openvms.digital.com/freeware/
       You' have to fix the following bug:
@@ -102,7 +102,7 @@
       versions of VMS. If you get lib$get_current_invo_context undefined
       while linking you'll have to add
          "lib$get_current_invo_context"="LIB$GET_CURR_INVO_CONTEXT"
-      in [.src.unix]descrip.mms to CXX_DEFINE. and recompile wxWindows.
+      in [.src.unix]descrip.mms to CXX_DEFINE. and recompile wxWidgets.
 
     -Some versions of the CC compiler give warnings like
        %CC-W-CXXKEYWORD, "bool" is a keyword in C++ .... when compiling
@@ -120,7 +120,7 @@
   -I think in general wxGTK is better maintained, so that version is my
     first choice.
   
-  -Note that only a few people have used wxWindows on VMS so many problems are
+  -Note that only a few people have used wxWidgets on VMS so many problems are
    to be expected.
 
 

Index: internal/wxPython-2.5/docs/tech/tn0007.txt
diff -u internal/wxPython-2.5/docs/tech/tn0007.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0007.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0007.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0007.txt	Wed Sep 22 14:21:14 2004
@@ -2,7 +2,7 @@
 ======================================
 
 
-Please use wxWindows 2.4.x - this is not currently supported in wxWindows 2.5.1
+Please use wxWidgets 2.4.x - this is not currently supported in wxWidgets 2.5.2
 
 
 

Index: internal/wxPython-2.5/docs/wine/install.txt
diff -u internal/wxPython-2.5/docs/wine/install.txt:2.1.5.1 internal/wxPython-2.5/docs/wine/install.txt:2.2
--- internal/wxPython-2.5/docs/wine/install.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/wine/install.txt	Wed Sep 22 14:21:16 2004
@@ -2,7 +2,7 @@
 * The most simple case
 -----------------------
 
-If you compile wxWindows on Linux for the first time and don't like to read 
+If you compile wxWidgets on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
 
 > ./configure --with-wine
@@ -37,7 +37,7 @@
 > ldconfig
 > exit
 
-If you want to remove wxWindows on Unix you can do this:
+If you want to remove wxWidgets on Unix you can do this:
 
 > su <type root password>
 > make uninstall
@@ -47,10 +47,10 @@
 * The expert case
 -----------------
 
-If you want to do some more serious cross-platform programming with wxWindows, 
+If you want to do some more serious cross-platform programming with wxWidgets, 
 such as for GTK and Motif, you can now build two complete libraries and use 
 them concurrently. For this end, you have to create a directory for each build 
-of wxWindows - you may also want to create different versions of wxWindows
+of wxWidgets - you may also want to create different versions of wxWidgets
 and test them concurrently. Most typically, this would be a version configured 
 with --enable-debug_flag and one without. Note, that only one build can currently 
 be installed, so you'd have to use local version of the library for that purpose.
@@ -102,7 +102,7 @@
 * General
 -----------------------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with your 
+The Unix variants of wxWidgets use GNU configure. If you have problems with your 
 make use GNU make instead.
 
 If you have general problems with installation, read my homepage at 
@@ -117,7 +117,7 @@
 * GUI libraries
 -----------------------
 
-wxWindows/WINE requires the WINE library to be installed on your system. 
+wxWidgets/WINE requires the WINE library to be installed on your system. 
 
 You can get the newest version of the WINE from the WINE homepage at:
 
@@ -162,7 +162,7 @@
 are enabled by default.
 
 Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
+in wxWidgets snapshot 6, but not yet all (ODBC not).
 
 You must do this by running configure with either of:
 
@@ -206,7 +206,7 @@
                             such as gdb (or its many frontends).
 
     --enable-debug_flag     Define __DEBUG__ and __WXDEBUG__ when
-                            compiling. This enable wxWindows' very
+                            compiling. This enable wxWidgets' very
                             useful internal debugging tricks (such
                             as automatically reporting illegal calls)
                             to work. Note that program and library
@@ -217,11 +217,11 @@
 -------------------
 
 Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
+in wxWidgets snapshot 6, but not yet all (ODBC not).
 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
-drastically reduced by removing features from wxWindows that 
+drastically reduced by removing features from wxWidgets that 
 are not used in your program. The most relevant such features
 are
 
@@ -286,7 +286,7 @@
 
         make install    
 
-You can remove any traces of wxWindows by typing
+You can remove any traces of wxWidgets by typing
 
         make uninstall
     
@@ -323,7 +323,7 @@
 to stick to tmake.
 
 2) The other way creates a project within the source code 
-directories of wxWindows. For this endeavour, you'll need
+directories of wxWidgets. For this endeavour, you'll need
 the usual number of GNU tools, at least
 
 GNU automake version 1.4

Index: internal/wxPython-2.5/distrib/msw/mac.rsp
diff -u internal/wxPython-2.5/distrib/msw/mac.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/mac.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/mac.rsp:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/mac.rsp	Wed Sep 22 14:21:02 2004
@@ -5,46 +5,55 @@
 docs/mac/*.hqx
 docs/mac/*.sh
 docs/mac/*.applescript
+docs/mac/*.diff
 
 distrib/mac/*-sh
 
-src/wxWindows.pbproj/project.pbxproj
+src/html/htmlctrl/webkit/*.mm
 
-src/common/dosyacc.c
-src/common/doslex.c
-src/common/y_tab.c
-src/common/lex_yy.c
-src/common/*.rc
-
-src/mac/*.cpp
-src/mac/*.c
-src/mac/*.r
-src/mac/*.h
-src/mac/*.lst
-src/mac/morefile/*.c
-src/mac/morefile/*.cpp
-src/mac/morefile/*.h
-src/mac/morefilex/*.c
-src/mac/morefilex/*.cpp
-src/mac/morefilex/*.h
-src/mac/Info.plist.in
-src/mac/wxmac.icns
-src/macsock/sock_PPC.lib
+samples/html/htmlctrl/*.cpp
+samples/html/htmlctrl/Makefile.in
+samples/html/htmlctrl/makefile.gcc
+samples/html/htmlctrl/makefile.vc
+samples/html/htmlctrl/makefile.wat
+samples/html/htmlctrl/makefile.bcc
+samples/html/htmlctrl/*.bkl
 
-src/mac/cdef/*.h
-src/mac/cdef/*.c
-src/mac/cdef/*.mcp
+src/wxWindows.pbproj/project.pbxproj
+src/wxWindows.xcode/project.pbxproj
 
-src/mac/ldef/*.h
-src/mac/ldef/*.c
-src/mac/ldef/*.mcp
+src/mac/wxmac.icns
 
-src/mac/macsock/*.lib
+src/mac/carbon/*.cpp
+src/mac/carbon/*.c
+src/mac/carbon/*.r
+src/mac/carbon/*.h
+src/mac/carbon/morefile/*.c
+src/mac/carbon/morefile/*.cpp
+src/mac/carbon/morefile/*.h
+src/mac/carbon/morefilex/*.c
+src/mac/carbon/morefilex/*.cpp
+src/mac/carbon/morefilex/*.h
+src/mac/carbon/Info.plist.in
+src/mac/carbon/wxmac.icns
+
+src/mac/classic/*.cpp
+src/mac/classic/*.c
+src/mac/classic/*.r
+src/mac/classic/*.h
+src/mac/classic/morefile/*.c
+src/mac/classic/morefile/*.cpp
+src/mac/classic/morefile/*.h
+src/mac/classic/Info.plist.in
+src/mac/classic/wxmac.icns
 
 include/wx_pb.h
 include/wx/mac/*.h
+include/wx/mac/carbon/*.h
+include/wx/mac/carbon/private/*.h
+include/wx/mac/classic/*.h
+include/wx/mac/classic/private/*.h
 include/wx/mac/private/*.h
 
-samples/sample.r
 samples/minimal/minimal.pbproj/project.pbxproj
 

Index: internal/wxPython-2.5/distrib/msw/tmake/base.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/base.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/base.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/base.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/base.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxBase library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 27.01.00
-#! Version: $Id: base.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: base.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/msw/wince/guidelines.txt
diff -u internal/wxPython-2.5/docs/msw/wince/guidelines.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/wince/guidelines.txt:2.2
--- internal/wxPython-2.5/docs/msw/wince/guidelines.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/wince/guidelines.txt	Wed Sep 22 14:21:12 2004
@@ -41,5 +41,12 @@
 #include "wx/msw/private.h"
 (VZ)
 
+7. Use shortcuts to verify device you are building for:
+    #ifdef WIN32_PLATFORM_WFSP      ==   #ifdef __SMARTPHONE__
+    #ifdef WIN32_PLATFORM_PSPC      ==   #ifdef __POCKETPC__
+    #ifdef WCE_PLATFORM_STANDARDSDK ==   #ifdef __WINCE_STANDARDSDK__
+    #if (complex condition)         ==   #ifdef __HANDHELDPC__
+
+
   Marco Cavallini 
 www.koansoftware.com

Index: internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript
diff -u internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript:2.1.5.1 internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript:2.2
--- internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M5xml2mcp.applescript	Wed Sep 22 14:21:07 2004
@@ -4,7 +4,7 @@
 -- Author:      Gilles Depeyrot
 -- Modified by:
 -- Created:     30.11.2001
--- RCS-ID:      $Id: M5xml2mcp.applescript,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+-- RCS-ID:      $Id: M5xml2mcp.applescript,v 2.2 2004/09/22 21:21:07 heikki Exp $
 -- Copyright:   (c) 2001 Gilles Depeyrot
 -- Licence:     wxWindows licence
 -----------------------------------------------------------------------------

Index: internal/wxPython-2.5/distrib/msw/tmake/makeall.bat
diff -u internal/wxPython-2.5/distrib/msw/tmake/makeall.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/makeall.bat:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/makeall.bat:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/makeall.bat	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 rem Author:    Vadim Zeitlin
 rem Created:   14.07.99
 rem Copyright: (c) 1999 Vadim Zeitlin
-rem Version:   $Id: makeall.bat,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+rem Version:   $Id: makeall.bat,v 2.2 2004/09/22 21:21:03 heikki Exp $
 rem
 rem Makefile to create the makefiles for all compilers from the templates using
 rem tmake. The environment variable WX or WXWIN should be defined and contain

Index: internal/wxPython-2.5/distrib/msw/tardist.bat
diff -u internal/wxPython-2.5/distrib/msw/tardist.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/tardist.bat:2.2
--- internal/wxPython-2.5/distrib/msw/tardist.bat:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tardist.bat	Wed Sep 22 14:21:02 2004
@@ -1,5 +1,5 @@
 @echo off
-rem Tar up an external distribution of wxWindows 2.0: but
+rem Tar up an external distribution of wxWidgets 2.0: but
 rem putting in separate ASCII and binary files
 rem This seems to be the one that works, using
 rem separate tar programs for conversion/non-conversion
@@ -7,7 +7,7 @@
 
 if "%1" == "" goto usage
 if "%2" == "" goto usage
-echo About to archive an external wxWindows 2.0 distribution:
+echo About to archive an external wxWidgets 2.0 distribution:
 echo   From   %1
 echo   To     %2\wx200_1.tgz, %2\wx200_2.tgz, %2\wx200hlp.tgz, %2\wx200ps.tgz, %2\wx200htm.tgz
 echo CTRL-C if this is not correct.
@@ -104,11 +104,11 @@
 ren %2\wx200pdf.tar.gz %2\wx200pdf.tgz
 
 cd %2
-echo wxWindows archived.
+echo wxWidgets archived.
 goto end
 
 :usage
-echo Tar/gzip wxWindows distribution under DOS, making an ASCII and binary file
+echo Tar/gzip wxWidgets distribution under DOS, making an ASCII and binary file
 echo Usage: tardist source destination
 echo e.g. tardist d:\wx d:\wx\deliver
 

Index: internal/wxPython-2.5/docs/tech/tn0017.txt
diff -u internal/wxPython-2.5/docs/tech/tn0017.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0017.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0017.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0017.txt	Wed Sep 22 14:21:14 2004
@@ -1,7 +1,7 @@
-                    How to write unit tests for wxWindows
+                    How to write unit tests for wxWidgets
                     =====================================
 
- Unit tests for wxWindows are written using small cppunit framework. To compile
+ Unit tests for wxWidgets are written using small cppunit framework. To compile
 (but not to run) them you need to have it installed. Hence the first part of
 this note explains how to do it while the second one explains how to write the
 test.
@@ -50,8 +50,8 @@
 ----------------------
 
 1. Regenerate the make/project files from test.bkl using bakefile_gen, e.g.:
-        cd build/bakefile
-        bakefile_gen ../../tests/test.bkl
+        cd build/bakefiles
+        bakefile_gen -b ../../tests/test.bkl
    and if you're on a unix system re-run configure.
 
 2. Build the test program using one of the make/project files in the tests
@@ -59,7 +59,7 @@
 
 3. Run the test program with no arguments to run the default set of tests
    (which are all those registered with CPPUNIT_TEST_SUITE_REGISTRATION).
-   Or to list the tests without running them:
+   Or to list the test suites without running them:
       test -l
 
 4. Tests that have been registered under a name using
@@ -67,7 +67,7 @@
    example:
       test MBConvTestCase
    or to list the tests:
-      test -l MBConvTestCase
+      test -L MBConvTestCase
 
 
 IV. Notes
@@ -76,14 +76,29 @@
 1. You can register your tests (or a subset of them) just under a name, and not
    in the unnamed registry if you don't want them to be executed by default.
 
-2. If you are going to register your tests both in the unnamed registry and
-   under a name, then use the name that the tests have in the 'test -l'
-   listing (which is often the name of the TestCase class). Then the top
-   level names in a 'test -l' listing can be a hint as to the name those
-   tests have been registered under.
+2. If you are going to register your tests both in the unnamed registry
+   and under a name, then use the name that the tests have in the 'test -l'
+   listing.
+
+3. Tests which fail can be temporarily registered under "fixme" while the
+   problems they expose are fixed, instead of the unnamed registry. That
+   way they can easily be run, but they do not make regression testing with
+   the default suite more difficult. E.g.:
+
+    // register in the unnamed registry so that these tests are run by default
+    //CPPUNIT_TEST_SUITE_REGISTRATION(wxRegExTestCase);
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(wxRegExTestCase, "fixme");
+
+    // also include in it's own registry so that these tests can be run alone
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(wxRegExTestCase, "wxRegExTestCase");
+
+4. Tests which take a long time to execute can be registered under "advanced"
+   instead of the unnamed registry. The default suite should execute reasonably
+   quickly. To run the default and advanced tests together:
+    test "" advanced
 
 
 === EOF ===
 
 Author:  VZ
-Version: $Id: tn0017.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0017.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/docs/tech/tn0015.txt
diff -u internal/wxPython-2.5/docs/tech/tn0015.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0015.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0015.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0015.txt	Wed Sep 22 14:21:14 2004
@@ -1,4 +1,4 @@
-                How to add new bitmaps to wxWindows UI elements
+                How to add new bitmaps to wxWidgets UI elements
                 ===============================================
 
 0. Introduction
@@ -10,7 +10,7 @@
 resource file (include/wx/msw/wx.rc) or by including XPM files in the code.
 
 wxArtProvider should be used instead, to allow users to customize the look of
-their wxWindows app. This technote is a detailed description of steps needed
+their wxWidgets app. This technote is a detailed description of steps needed
 when adding new bitmap/icon.
 
 1. Adding new resource
@@ -77,7 +77,7 @@
 -------------------
 
 It is highly desirable to let the users know what stock bitmaps are available
-in wxWindows. The "artprov" sample serves this purpose: it contains a browser
+in wxWidgets. The "artprov" sample serves this purpose: it contains a browser
 dialog that displays all available art resources.
 
 It has to be updated to accomodate for new bitmaps. Fortunately, this is
@@ -89,4 +89,4 @@
 
 === EOF ===
 
-Version: $Id: tn0015.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0015.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/docs/motif/readme.txt
diff -u internal/wxPython-2.5/docs/motif/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/motif/readme.txt:2.2
--- internal/wxPython-2.5/docs/motif/readme.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/motif/readme.txt	Wed Sep 22 14:21:10 2004
@@ -1,13 +1,13 @@
 
-  Welcome to wxWindows/Motif 2.5.1
+  Welcome to wxWidgets/Motif 2.5.2
 
-You have downloaded version 2.5.1 of the Motif port of
-the wxWindows GUI library.
+You have downloaded version 2.5.2 of the Motif port of
+the wxWidgets GUI library.
 
-More information about the wxWindows project as a whole
+More information about the wxWidgets project as a whole
 can be found at:
 
-  http://www.wxwindows.org/
+  http://www.wxwidgets.org/
   
 Information on how to install can be found in the file 
 install.txt, but if you cannot wait, this should work on
@@ -26,26 +26,26 @@
 When you run into problems, please read the install.txt and
 follow those instructions. If you still don't have any success,
 please send a bug report to one of our mailing lists (see
-the wxWindows homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
+the wxWidgets homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
 YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
 DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED.
 Alternatively, you may also use the bug reporting system
-linked from the wxWindows web page.
+linked from the wxWidgets web page.
 
 The library produced by the install process will be called 
 libwx_motif.a (static) and libwx_motif-2.5.so.0.0.0 (shared) so that
-once a binary incompatible version of wxWindows/Motif comes out 
+once a binary incompatible version of wxWidgets/Motif comes out 
 we'll augment the library version number to avoid linking problems.
 
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
-on how to subscribe is available from www.wxwindows.org.
+bug reports or comments to the wxWidgets users list. Information 
+on how to subscribe is available from www.wxwidgets.org.
 
-wxWindows/Motif doesn't come with any guarantee whatsoever. It might 
+wxWidgets/Motif doesn't come with any guarantee whatsoever. It might 
 crash your hard disk or destroy your monitor. It doesn't claim to be
 suitable for any special or general purpose.
 
   Regards,
 
-  The wxWindows team
+  The wxWidgets team
 

Index: internal/wxPython-2.5/distrib/msw/os2.rsp
diff -u internal/wxPython-2.5/distrib/msw/os2.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/os2.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/os2.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/os2.rsp	Wed Sep 22 14:21:02 2004
@@ -21,6 +21,8 @@
 src/os2/makefile.va
 src/os2/*.def
 src/os2/*.lst
+src/os2/*.sh
+src/*.icc
 
 include/wx/os2/*.h
 include/wx/os2/*.rc
@@ -29,3 +31,5 @@
 include/wx/msw/*.ico
 include/wx/msw/*.bmp
 
+samples/minimal/Minimal.icc
+

Index: internal/wxPython-2.5/distrib/msw/msw.rsp
diff -u internal/wxPython-2.5/distrib/msw/msw.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/msw.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/msw.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/msw.rsp	Wed Sep 22 14:21:02 2004
@@ -3,10 +3,6 @@
 
 lib/dummy
 lib/wx*.def
-lib/watcom/*.txt
-lib/watcom/*.lib
-lib/watcom/*.bat
-lib/bcc16/*.lib
 lib/_sc/*.txt
 lib/_sc/*.def
 
@@ -56,8 +52,6 @@
 src/version.mak
 src/*.bat
 
-src/common/dosyacc.c
-src/common/doslex.c
 src/common/*.rc
 
 src/msw/*.cpp
@@ -109,15 +103,6 @@
 samples/ownerdrw/*.txt
 samples/ownerdrw/*.bkl
 
-samples/taskbar/*.cpp
-samples/taskbar/*.h
-samples/taskbar/makefile.*
-samples/taskbar/*.rc
-samples/taskbar/*.def
-samples/taskbar/*.bmp
-samples/taskbar/*.ico
-samples/taskbar/*.txt
-
 samples/regtest/*.cpp
 samples/regtest/*.h
 samples/regtest/makefile.*
@@ -159,33 +144,3 @@
 samples/oleauto/*.ico
 samples/oleauto/*.bkl
 
-src/wxWindows.dsp
-src/wxWindows.dsw
-src/wxUniv.dsp
-src/wxUniv.dsw
-src/wxBase.dsp
-src/wxBase.dsw
-
-src/jpeg/jpeg.dsp
-src/jpeg/jpeg.dsw
-
-src/tiff/tiff.dsp
-src/tiff/tiff.dsw
-
-src/zlib/zlib.dsp
-src/zlib/zlib.dsw
-
-src/png/png.dsp
-src/png/png.dsw
-
-samples/dialogs/dialogs.dsp
-samples/dialogs/dialogs.dsw
-
-samples/minimal/minimal.dsp
-samples/minimal/minimal.dsw
-samples/minimal/minimalUniv.dsp
-
-samples/widgets/widgets.dsp
-samples/widgets/widgets.dsw
-samples/widgets/widgetsUniv.dsp
-

Index: internal/wxPython-2.5/distrib/msw/tmake/g95.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/g95.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/g95.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/g95.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/g95.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t g95 wxwin.pro -o makefile.g95
 #! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
 #! Created: 14.07.99
-#! Version: $Id: g95.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: g95.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/tmake/b32base.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/b32base.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/b32base.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/b32base.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/b32base.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t b32 wxwin.pro
 #! Author:  Michael Fielding
 #! Created: 6-08-02
-#! Version: $Id: b32base.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: b32base.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 
 #${

Index: internal/wxPython-2.5/distrib/msw/tmake/sc.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/sc.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/sc.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/sc.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/sc.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t sc wxwin.pro -o makefile.sc
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: sc.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: sc.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 
 #${

Index: internal/wxPython-2.5/docs/cocoa/install.txt
diff -u internal/wxPython-2.5/docs/cocoa/install.txt:2.1.5.1 internal/wxPython-2.5/docs/cocoa/install.txt:2.2
--- internal/wxPython-2.5/docs/cocoa/install.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/cocoa/install.txt	Wed Sep 22 14:21:06 2004
@@ -6,19 +6,19 @@
 
 For the time being, the standard configure/make method works.  You will
 want to build static because there are a number of unimplemented functions
-that a shared library will need (becuase of wxWindows code internally using
+that a shared library will need (becuase of wxWidgets code internally using
 them) but that a static library will not (because most of the samples
 don't need it).
 
 On my system I have the following:
 
 Checked out CVS source is in:
-/Users/dfe/devel/wxHEADcommit/wxWindows
+/Users/dfe/devel/wxHEADcommit/wxWidgets
 Debug build directory is:
 /Users/dfe/devel/wxHEADcommit/BUILD_COCOAd
 
 From the debug build directory:
-$ ../wxWindows/configure --with-cocoa --enable-debug --disable-shared
+$ ../wxWidgets/configure --with-cocoa --enable-debug --disable-shared
 $ make
 $ cd samples/minimal
 $ make

Index: internal/wxPython-2.5/docs/mac/ansi.diff
diff -u /dev/null internal/wxPython-2.5/docs/mac/ansi.diff:2.1
--- /dev/null	Wed Sep 22 14:21:23 2004
+++ internal/wxPython-2.5/docs/mac/ansi.diff	Wed Sep 22 14:21:07 2004
@@ -0,0 +1,25 @@
+--- ansi.h.old	Mon Mar 29 19:47:26 2004
++++ ansi.h	Mon Mar 29 19:55:56 2004
+@@ -38,6 +38,11 @@
+ 	#define _BSD_RUNE_T_	__WCHAR_TYPE__			/* rune_t */
+ 	
++        
++	#ifndef WCHAR_MIN
+ 	#define WCHAR_MIN	((wchar_t) 0x80000000U)
++	#endif
++	#ifndef WCHAR_MAX
+ 	#define WCHAR_MAX	((wchar_t) 0x7FFFFFFFU)
++	#endif
+ 	
+ 	typedef wchar_t	wint_t;
+@@ -49,5 +54,9 @@
+ 
+ #ifndef _ANSI_SOURCE
+-	typedef _BSD_WCHAR_T_	rune_t;
++ #ifndef _BSD_RUNE_T_DEFINED_
++  #define _BSD_RUNE_T_DEFINED_
++  typedef _BSD_RUNE_T_ rune_t;
++ #endif
++  /*	typedef _BSD_WCHAR_T_	rune_t; */
+ #endif
+ 

Index: internal/wxPython-2.5/distrib/msw/tarwxmotif
diff -u internal/wxPython-2.5/distrib/msw/tarwxmotif:2.1.5.1 internal/wxPython-2.5/distrib/msw/tarwxmotif:2.2
--- internal/wxPython-2.5/distrib/msw/tarwxmotif:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tarwxmotif	Wed Sep 22 14:21:02 2004
@@ -1,5 +1,5 @@
 #!/bin/sh
-# tardist: make up a tar.gz distribution of wxWindows 2
+# tardist: make up a tar.gz distribution of wxWidgets 2
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 init=""
@@ -14,7 +14,7 @@
   exit
 fi
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From   $1
 echo   To     $2
 echo CTRL-C if this is not correct.
@@ -29,7 +29,7 @@
 chmod a+x $1/configure $1/config.sub $1/config.guess $1/samples/configure $1/demos/configure $1/contrib/configure
 
 rm -f $2/wxMotif-${WXVER}*.tgz
-rm -f $2/wxWindows*.tgz
+rm -f $2/wxWidgets*.tgz
 rm -f $2/tex2rtf2.tgz
 rm -f $2/ogl3.tgz
 rm -f $2/jpeg.tgz
@@ -45,27 +45,27 @@
 
 ### HTML docs
 ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
-tar cvf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
-gzip $2/wxWindows-${WXVER}-HTML.tar
-mv $2/wxWindows-${WXVER}-HTML.tar.gz $2/wxWindows-${WXVER}-HTML.tgz
+tar cvf $2/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
+gzip $2/wxWidgets-${WXVER}-HTML.tar
+mv $2/wxWidgets-${WXVER}-HTML.tar.gz $2/wxWidgets-${WXVER}-HTML.tgz
 
 ### HTB (wxHTML Help) docs
 ls `cat $1/distrib/msw/wx_htb.rsp` > /tmp/htb.txt
-tar cvf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
-gzip $2/wxWindows-${WXVER}-HTB.tar
-mv $2/wxWindows-${WXVER}-HTB.tar.gz $2/wxWindows-${WXVER}-HTB.tgz
+tar cvf $2/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
+gzip $2/wxWidgets-${WXVER}-HTB.tar
+mv $2/wxWidgets-${WXVER}-HTB.tar.gz $2/wxWidgets-${WXVER}-HTB.tgz
 
 ### PDF docs
 ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
-tar cvf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
-gzip $2/wxWindows-${WXVER}-PDF.tar
-mv $2/wxWindows-${WXVER}-PDF.tar.gz $2/wxWindows-${WXVER}-PDF.tgz
+tar cvf $2/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
+gzip $2/wxWidgets-${WXVER}-PDF.tar
+mv $2/wxWidgets-${WXVER}-PDF.tar.gz $2/wxWidgets-${WXVER}-PDF.tgz
 
 ### Stubs files
 #ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
-#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
-#gzip $2/wxWindows-${WXVER}-stubs.tar
-#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
+#tar cvf $2/wxWidgets-${WXVER}-stubs.tar -T /tmp/stubs.txt
+#gzip $2/wxWidgets-${WXVER}-stubs.tar
+#mv $2/wxWidgets-${WXVER}-stubs.tar.gz $2/wxWidgets-${WXVER}-stubs.tgz
 
 ### Tex2RTF
 ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt

Index: internal/wxPython-2.5/distrib/msw/makefile.rsp
diff -u internal/wxPython-2.5/distrib/msw/makefile.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/makefile.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/makefile.rsp:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/makefile.rsp	Wed Sep 22 14:21:02 2004
@@ -1,6 +1,7 @@
 Makefile.in
 src/regex/Makefile.in
 locale/Makefile
+tests/Makefile.in
 samples/Makefile.in
 samples/access/Makefile.in
 samples/artprov/Makefile.in
@@ -20,6 +21,7 @@
 samples/dynamic/Makefile.in
 samples/erase/Makefile.in
 samples/except/Makefile.in
+samples/except/Makefile.in
 samples/exec/Makefile.in
 samples/event/Makefile.in
 samples/grid/Makefile.in
@@ -37,6 +39,7 @@
 samples/html/virtual/Makefile.in
 samples/html/widget/Makefile.in
 samples/html/zip/Makefile.in
+samples/html/htmlctrl/Makefile.in
 samples/image/Makefile.in
 samples/joytest/Makefile.in
 samples/layout/Makefile.in
@@ -61,8 +64,10 @@
 samples/shaped/Makefile.in
 samples/sound/Makefile.in
 samples/sockets/Makefile.in
+samples/splash/Makefile.in
 samples/splitter/Makefile.in
 samples/statbar/Makefile.in
+samples/taskbar/Makefile.in
 samples/text/Makefile.in
 samples/thread/Makefile.in
 samples/toolbar/Makefile.in
@@ -180,3 +185,4 @@
 src/regex/descrip.mms
 utils/helpview/src/descrip.mms
 utils/tex2rtf/src/descrip.mms
+

Index: internal/wxPython-2.5/distrib/msw/tmake/basevc.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/basevc.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/basevc.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/basevc.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/basevc.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t basevc wxwin.pro -o makebase.vc
 #! Author:  Mark Johnson   
 #! Created: 12.03.2001
-#! Version: $Id: basevc.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: basevc.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/tmake/wat.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/wat.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/wat.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/wat.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/wat.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t wat wxwin.pro -o makefile.wat
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: wat.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: wat.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #! Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #!#############################################################################
 #${

Index: internal/wxPython-2.5/distrib/msw/tmake/micro.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/micro.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/micro.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/micro.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/micro.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMicroWindows library is generated by tmake
 #! Author:  Robert Roebling
 #! Created: 28.01.00
-#! Version: $Id: micro.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: micro.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/mac/install.txt
diff -u internal/wxPython-2.5/docs/mac/install.txt:2.1.5.1 internal/wxPython-2.5/docs/mac/install.txt:2.2
--- internal/wxPython-2.5/docs/mac/install.txt:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/install.txt	Wed Sep 22 14:21:07 2004
@@ -1,10 +1,10 @@
-wxWindows 2.5 for Mac installation
+wxWidgets 2.5 for Mac installation
 ----------------------------------
 
 On MacOS X, you can download Apple's free developer tools (gcc
 and associated headers and libraries, such as the Carbon API).
 You can then use configure in a similar way to compiling
-wxWindows on Linux (or on Windows using MinGW or Cygwin). See
+wxWidgets on Linux (or on Windows using MinGW or Cygwin). See
 'Apple Developer Tools' below for more details on using
 configure.
 
@@ -44,6 +44,15 @@
 CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbonized Runtimes 
 (consult the file CodeWarrior Pro 5:Pre-Release:Carbon & MacOSX Development:Carbon & MacOSX README)
 
+Patching headers: CodeWarrior 8.x
+---------------------------------
+
+If you run into trouble with WCHAR_MIN and WCHAR_MAX in ansi.h,
+apply the patch ansi.diff.
+
+You may also need to comment out the _T definition in
+ctype.h if you get multiple definition errors.
+
 setup.h
 -------
 
@@ -102,6 +111,7 @@
   - M5build.applescript to automatically build all samples/demos projects
   - M8xml2mcp.applescript to convert xml files to CodeWarrior 8 projects
   - M8mcp2xml.applescript to convert CodeWarrior 8 projects to xml files
+  - SetXMLCreator.applescript to set correct creator type (see below)
 
 To run the XML to MCP conversion scripts:
 
@@ -111,6 +121,9 @@
 them to mcps. If some conversions fail it means an mcp already
 exists (back them up prior to running the script).
 
+To set the correct creator type for importing into CodeWarrior,
+you may need to run SetXMLCreator.applescript.
+
 Apple Developer Tools
 ---------------------
 
@@ -132,10 +145,10 @@
 7) type <YOUR OWN PASSWORD>
 
 Note that while using this method is okay for development, it is not
-recommended that you require endusers to install wxWindows into their
+recommended that you require endusers to install wxWidgets into their
 system directories in order to use your program.  One way to avoid this
-is to configure wxWindows with --disable-shared.  Another way to avoid
-it is to make a framework for wxWindows.  Making frameworks is beyond
+is to configure wxWidgets with --disable-shared.  Another way to avoid
+it is to make a framework for wxWidgets.  Making frameworks is beyond
 the scope of this document.
 
 Note:

Index: internal/wxPython-2.5/docs/mac/M5build.applescript
diff -u internal/wxPython-2.5/docs/mac/M5build.applescript:2.1.5.1 internal/wxPython-2.5/docs/mac/M5build.applescript:2.2
--- internal/wxPython-2.5/docs/mac/M5build.applescript:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M5build.applescript	Wed Sep 22 14:21:07 2004
@@ -4,7 +4,7 @@
 -- Author:      Gilles Depeyrot
 -- Modified by:
 -- Created:     06.10.2001
--- RCS-ID:      $Id: M5build.applescript,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+-- RCS-ID:      $Id: M5build.applescript,v 2.2 2004/09/22 21:21:07 heikki Exp $
 -- Copyright:   (c) 2001 Gilles Depeyrot
 -- Licence:     wxWindows licence
 -----------------------------------------------------------------------------

Index: internal/wxPython-2.5/distrib/msw/cocoa.rsp
diff -u /dev/null internal/wxPython-2.5/distrib/msw/cocoa.rsp:2.1
--- /dev/null	Wed Sep 22 14:21:18 2004
+++ internal/wxPython-2.5/distrib/msw/cocoa.rsp	Wed Sep 22 14:21:02 2004
@@ -0,0 +1,5 @@
+include/wx/cocoa/*.h
+src/cocoa/*.cpp
+src/cocoa/*.mm
+src/cocoa/*.r
+docs/cocoa/*.txt

Index: internal/wxPython-2.5/distrib/msw/tarwxmac
diff -u internal/wxPython-2.5/distrib/msw/tarwxmac:2.1.5.1 internal/wxPython-2.5/distrib/msw/tarwxmac:2.2
--- internal/wxPython-2.5/distrib/msw/tarwxmac:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tarwxmac	Wed Sep 22 14:21:02 2004
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -70,10 +70,14 @@
 echo Tarring...
 
 ### wxMac
-cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+cat $1/distrib/msw/mac.rsp $1/distrib/msw/cocoa.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
 $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
+cat $1/distrib/msw/cw_mac.rsp > /tmp/wxmac_in.txt
+expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
+$TAR cf $2/wxWidgets-${WXVER}-CW-Mac.tar -T /tmp/wxmac.txt
+
 rm -f $1/include/wx/setup.h
 
 echo Re-tarring in a subdirectory...
@@ -91,10 +95,21 @@
 rm -f -r wxMac-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
+echo Re-tarring CW project files...
+cd $2
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf $2/wxWidgets-${WXVER}-CW-Mac.tar
+cd ..
+rm -f wxWidgets-${WXVER}-CW-Mac.tar
+$TAR zcf wxWidgets-${WXVER}-CW-Mac.tar.gz wxWidgets-${WXVER}/*
+
 # Copy readme and other files
 cp $1/docs/readme.txt $2/readme-${WXVER}.txt
 cp $1/docs/changes.txt $2/changes-${WXVER}.txt
 cp $1/docs/mac/readme.txt $2/readme-mac-${WXVER}.txt
 cp $1/docs/mac/install.txt $2/install-mac-${WXVER}.txt
+cp $1/docs/cocoa/readme.txt $2/readme-cocoa-${WXVER}.txt
+cp $1/docs/cocoa/install.txt $2/install-cocoa-${WXVER}.txt
 
 echo Done!

Index: internal/wxPython-2.5/distrib/msw/tmake/motif.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/motif.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/motif.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/motif.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/motif.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMotif library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 28.01.00
-#! Version: $Id: motif.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: motif.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     use lib './lib';

Index: internal/wxPython-2.5/distrib/msw/tmake/watmgl.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/watmgl.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/watmgl.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/watmgl.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/watmgl.t	Wed Sep 22 14:21:03 2004
@@ -8,7 +8,7 @@
 #!            - OLE files not generated correctly (need 'ole/' directory)
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: watmgl.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: watmgl.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/microwin/readme.txt
diff -u internal/wxPython-2.5/docs/microwin/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/microwin/readme.txt:2.2
--- internal/wxPython-2.5/docs/microwin/readme.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/microwin/readme.txt	Wed Sep 22 14:21:09 2004
@@ -3,7 +3,7 @@
 
 Julian Smart 2001-12-08
 
-This is a port of wxWindows to MicroWindows, under Linux.
+This is a port of wxWidgets to MicroWindows, under Linux.
 Widgets are supplied by the wxUniversal project, while the
 underlying port uses the Windows ports with small modifications
 for the MicroWindows API.
@@ -45,7 +45,7 @@
 
   Note: these are already applied by the patch below.
 
-- apply microwindows.patches (from wxWindows:
+- apply microwindows.patches (from wxWidgets:
   docs/microwin/microwindows.patches) to fix PeekMessage
   and other issues. If the patch doesn't apply automatically,
   you may need to apply it by hand, and the relevant changed
@@ -156,7 +156,7 @@
 for FILE_IO, even though for inline XPMs we don't need file I/O.
 (Embedded systems tend not to have file I/O, anyway.)
 
-Now, wxWindows has its own XPM decoder, src/common/xpmdecod.cpp,
+Now, wxWidgets has its own XPM decoder, src/common/xpmdecod.cpp,
 so in theory we don't need to use MicroWindows' code there.
 wxImage can load an inline XPM, _but_ we need to convert to
 a wxBitmap since this is what the widgets need.

Index: internal/wxPython-2.5/distrib/msw/tmake/watbase.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/watbase.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/watbase.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/watbase.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/watbase.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t wat wxwin.pro -o makefile.wat
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: watbase.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: watbase.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
@@ -49,7 +49,7 @@
 # Purpose:      Builds wxBase library for Watcom C++ under Win32
 # Author:       Vadim Zeitlin
 # Created:      21.01.03
-# RCS-ID:       $Id: watbase.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+# RCS-ID:       $Id: watbase.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 # Copyright:    (c) 2003 Vadim Zeitlin <vadim at wxwindows.org>
 # Licence:      wxWindows licence
 ##############################################################################

Index: internal/wxPython-2.5/distrib/msw/copy_src.bat
diff -u internal/wxPython-2.5/distrib/msw/copy_src.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/copy_src.bat:2.2
--- internal/wxPython-2.5/distrib/msw/copy_src.bat:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/copy_src.bat	Wed Sep 22 14:21:02 2004
@@ -584,6 +584,19 @@
 copy *.h \wxmsw_dist\wxMSW\samples\scroll
 cd ..
 
+echo Splash sample..
+
+cd splash
+md \wxmsw_dist\wxMSW\samples\splash
+copy Makefile.* \wxmsw_dist\wxMSW\samples\splash
+copy *.cpp \wxmsw_dist\wxMSW\samples\splash
+copy *.h \wxmsw_dist\wxMSW\samples\splash
+copy *.def \wxmsw_dist\wxMSW\samples\splash
+copy *.rc \wxmsw_dist\wxMSW\samples\splash
+copy *.ico \wxmsw_dist\wxMSW\samples\splash
+copy *.png \wxmsw_dist\wxMSW\samples\splash
+cd ..
+
 echo Splitter sample..
 
 cd splitter

Index: internal/wxPython-2.5/docs/tech/tn0002.txt
diff -u internal/wxPython-2.5/docs/tech/tn0002.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0002.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0002.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0002.txt	Wed Sep 22 14:21:14 2004
@@ -1,7 +1,7 @@
-                          wxWindows translator guide
+                          wxWidgets translator guide
                           ==========================
 
-This note is addressed to wxWindows translators.
+This note is addressed to wxWidgets translators.
 
 First of all, here is what you will need:
 
@@ -12,7 +12,7 @@
       mirror (RPMs and DEBs are also available from the usual places)
 
    b) for Windows you can download the precompiled binaries from
-      www.wxwindows.org or install PoEdit (poedit.sourceforge.org) and
+      www.wxwidgets.org or install PoEdit (poedit.sourceforge.org) and
       add <installdir>/poEdit/bin to your path (so it can find xgettext).
 
 2. A way to run a program recursively on an entire directory from the command
@@ -39,7 +39,7 @@
    program into a wxstd.po file which is a "text message catalog"
 
 2. this new wxstd.po file (recreated each time some new text messages are added
-   to wxWindows) is merged with existing translations in another .po file (for
+   to wxWidgets) is merged with existing translations in another .po file (for
    example, de.po) and replaces this file (this is done using the program
    msgmerge)
 
@@ -62,11 +62,17 @@
 === EOF ===
 
 Author:  VZ
-Version: $Id: tn0002.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0002.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $
 
 $Log: tn0002.txt,v $
-Revision 2.1.5.1  2004/04/09 01:15:20  markie
-Import from robin dunn tarball
+Revision 2.2  2004/09/22 21:21:14  heikki
+Bug 1472, upgrade to wxPython 2.5.2.9.
+
+Revision 2.1.5.1.4.2  2004/09/15 00:59:19  davids
+p4 changes.
+
+Revision 1.4  2004/05/04 08:26:58  JS
+Name change replacements
 
 Revision 1.3  2003/11/18 16:37:11  DS
 Updated translation technote to mention Makefile usage under Windows.

Index: internal/wxPython-2.5/docs/x11/install.txt
diff -u internal/wxPython-2.5/docs/x11/install.txt:2.1.5.1 internal/wxPython-2.5/docs/x11/install.txt:2.2
--- internal/wxPython-2.5/docs/x11/install.txt:2.1.5.1	Thu Apr  8 18:15:21 2004
+++ internal/wxPython-2.5/docs/x11/install.txt	Wed Sep 22 14:21:17 2004
@@ -1,4 +1,4 @@
-wxWindows 2.5 for X11 installation
+wxWidgets 2.5 for X11 installation
 ----------------------------------
 
 IMPORTANT NOTE:
@@ -9,25 +9,25 @@
   mailing wxwin-users or the author. Preferably, try to fix the
   problem first and then send a patch to the author.
 
-  When sending bug reports tell us what version of wxWindows you are 
+  When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxX11 2.5.1, gcc 2.95.4, Redhat 6.2
+  example: wxX11 2.5.2, gcc 2.95.4, Redhat 6.2
 
 First steps
 -----------
 
 - Download wxX11-x.y.z.tgz, where x.y.z is the version number.
   Download documentation in a preferred format, such as
-  wxWindows-HTML.zip or wxWindows-PDF.zip.
+  wxWidgets-HTML.zip or wxWidgets-PDF.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
   directory.
 
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles. You also need
-  libXpm if you want to have XPM support in wxWindows (recommended).
+  libXpm if you want to have XPM support in wxWidgets (recommended).
 
-- You can now use configure to build wxWindows and the samples.
+- You can now use configure to build wxWidgets and the samples.
 
   Using configure is the recommended way to build the library. If it doesn't
   work for you for whatever reason, please report it (together with detailed
@@ -40,7 +40,7 @@
 * The simplest case
 -------------------
 
-If you compile wxWindows on Linux for the first time and don't like to read 
+If you compile wxWidgets on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
 
 > ./configure --with-x11
@@ -58,7 +58,7 @@
 > ldconfig
 > exit
 
-If you want to remove wxWindows on Unix you can do this:
+If you want to remove wxWidgets on Unix you can do this:
 
 > su <type root password>
 > make uninstall
@@ -68,10 +68,10 @@
 * The expert case
 -----------------
 
-If you want to do some more serious cross-platform programming with wxWindows, 
+If you want to do some more serious cross-platform programming with wxWidgets, 
 such as for GTK and X11, you can now build two complete libraries and use 
 them concurrently. For this end, you have to create a directory for each build 
-of wxWindows - you may also want to create different versions of wxWindows
+of wxWidgets - you may also want to create different versions of wxWidgets
 and test them concurrently. Most typically, this would be a version configured 
 with --enable-debug_flag and one without. Note, that only one build can
 currently be installed, so you'd have to use local version of the library for
@@ -122,12 +122,12 @@
 * General
 ---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with
+The Unix variants of wxWidgets use GNU configure. If you have problems with
 your make use GNU make instead.
 
-If you have general problems with installation, see the wxWindows website at 
+If you have general problems with installation, see the wxWidgets website at 
 
-  http://www.wxwindows.org/
+  http://www.wxwidgets.org/
   
 for newest information. If you still don't have any success, please send a bug 
 report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF 
@@ -137,12 +137,12 @@
 * GUI libraries
 ---------------
 
-wxWindows/X11 requires the X11 library to be installed on your system.
+wxWidgets/X11 requires the X11 library to be installed on your system.
   
 * Additional libraries
 ----------------------
 
-wxWindows/X11 requires a thread library and X libraries known to work with
+wxWidgets/X11 requires a thread library and X libraries known to work with
 threads.  This is the case on all commercial Unix-Variants and all
 Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
 many aspects.  As of writing this, virtually all Linux distributions have
@@ -162,7 +162,7 @@
 
 Please send comments and question about the OS/2 installation
 to Stefan Neis <Stefan.Neis at t-online.de> and patches to
-the wxWindows mailing list.
+the wxWidgets mailing list.
 
 In the following list, the version numbers indicate the configuration that
 was actually used by myself, newer version should cause no problems and
@@ -268,9 +268,9 @@
 
 	--disable-shared        Do not create shared libraries.
 
-    --enable-monolithic     Build wxWindows as single library instead
+    --enable-monolithic     Build wxWidgets as single library instead
                             of as several smaller libraries (which is
-                            the default since wxWindows 2.5.0).
+                            the default since wxWidgets 2.5.0).
 
 	--disable-optimise	Do not optimise the code. Can
 	                        sometimes be useful for debugging
@@ -310,7 +310,7 @@
 				such as gdb (or its many frontends).
 
 	--enable-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
-	                        compiling. This enable wxWindows' very
+	                        compiling. This enable wxWidgets' very
 				useful internal debugging tricks (such
 				as automatically reporting illegal calls)
 				to work. Note that program and library
@@ -321,11 +321,11 @@
 -----------------
 
 Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
+in wxWidgets snapshot 6, but not yet all (ODBC not).
 
 When producing an executable that is linked statically with wxX11
 you'll be surprised at its immense size. This can sometimes be
-drastically reduced by removing features from wxWindows that 
+drastically reduced by removing features from wxWidgets that 
 are not used in your program. The most relevant such features
 are
 
@@ -396,7 +396,7 @@
 
         make install	
 
-You can remove any traces of wxWindows by typing
+You can remove any traces of wxWidgets by typing
 
         make uninstall
 	
@@ -432,14 +432,14 @@
 This is certain to become the standard way unless we decide
 to stick to tmake.
 
-If your application uses only some of wxWindows libraries, you can
+If your application uses only some of wxWidgets libraries, you can
 specify required libraries when running wx-config. For example,
 `wx-config --libs=html,core` will only output link command to link
 with libraries required by core GUI classes and wxHTML classes. See
 the manual for more information on the libraries.
 
 2) The other way creates a project within the source code 
-directories of wxWindows. For this endeavour, you'll need
+directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
@@ -456,7 +456,7 @@
   # makewxx11
   # Sets permissions (in case we extracted wxX11 from zip files)
   # and makes wxX11.
-  # Call from top-level wxWindows directory.
+  # Call from top-level wxWidgets directory.
   # Note that this uses standard (but commonly-used) configure options;
   # if you're feeling brave, you may wish to compile with threads:
   # if they're not supported by the target platform, they will be disabled
@@ -468,7 +468,7 @@
   -------:x-----Cut here-----:x-----
 
   This script will build wxX11 using shared libraries. If you want to build
-  a static wxWindows library, use --disable-shared.
+  a static wxWidgets library, use --disable-shared.
 
 Troubleshooting
 ---------------

Index: internal/wxPython-2.5/docs/motif/aix.txt
diff -u internal/wxPython-2.5/docs/motif/aix.txt:2.1.5.1 internal/wxPython-2.5/docs/motif/aix.txt:2.2
--- internal/wxPython-2.5/docs/motif/aix.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/motif/aix.txt	Wed Sep 22 14:21:10 2004
@@ -1,7 +1,7 @@
-Notes for wxWindows compilation on AIX
+Notes for wxWidgets compilation on AIX
 --------------------------------------
 
-wxWindows 2.0 has been compiled under AIX with the C set ++ 3.1.
+wxWidgets 2.0 has been compiled under AIX with the C set ++ 3.1.
 
 The environment variables CC and CXX should be set accordingly before running
 configure for the first time:

Index: internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript
diff -u internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript:2.1.5.1 internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript:2.2
--- internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M8mcp2xml.applescript	Wed Sep 22 14:21:07 2004
@@ -4,7 +4,7 @@
 -- Author:      Gilles Depeyrot
 -- Modified by:	Stefan Csomor for M8
 -- Created:     28.11.2001
--- RCS-ID:      $Id: M8mcp2xml.applescript,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+-- RCS-ID:      $Id: M8mcp2xml.applescript,v 2.2 2004/09/22 21:21:07 heikki Exp $
 -- Copyright:   (c) 2001 Gilles Depeyrot
 -- Licence:     wxWindows licence
 -----------------------------------------------------------------------------

Index: internal/wxPython-2.5/distrib/msw/tmake/vc.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/vc.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/vc.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/vc.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/vc.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t vc wxwin.pro -o makefile.vc
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: vc.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: vc.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/makerpm
diff -u internal/wxPython-2.5/distrib/msw/makerpm:2.1.5.1 internal/wxPython-2.5/distrib/msw/makerpm:2.2
--- internal/wxPython-2.5/distrib/msw/makerpm:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/makerpm	Wed Sep 22 14:21:02 2004
@@ -1,5 +1,8 @@
 #!/bin/sh
-# Makes the wxWindows RPMs
+# Makes the wxWidgets RPMs
+
+RPMBUILDARGS=
+PLATFORM=
 
 doupdatecvs()
 {
@@ -50,9 +53,9 @@
   echo Copying wxGTK.spec to $RPM_ROOT/SPECS...
   cp $WXSRC/wxGTK.spec $RPM_ROOT/SPECS
 
-  echo Starting wxGTK RPM build...
+  echo Starting wxGTK RPM build, rpmbuild args=$RPMBUILDARGS...
   cd $RPM_ROOT
-  rpmbuild -ba SPECS/wxGTK.spec 2>&1 | tee wxGTK.out
+  rpmbuild -ba $RPMBUILDARGS SPECS/wxGTK.spec 2>&1 | tee wxGTK.out
 
   echo Finished wxGTK RPM build, in $RPM_ROOT.
   echo "SRPMS:"
@@ -60,12 +63,14 @@
   echo "RPMS/i386:"
   ls RPMS/i386
 
-  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
-  cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST
-  cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST
+  mkdir $WXDEST/$PLATFORM
 
-  rm -f -r $WXDEST/wxgtk
+  cp $RPM_ROOT/SRPMS/*.rpm $WXDEST/$PLATFORM
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST/$PLATFORM
+  cp $WXDEST/wxgtk/release/*.tar.gz $WXDEST/$PLATFORM
+  cp $WXDEST/wxgtk/release/*.tar.bz2 $WXDEST/$PLATFORM
+
+#  rm -f -r $WXDEST/wxgtk
 
   echo Now try the RPMs with rpm -i.
 }
@@ -123,11 +128,11 @@
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxmgl/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmgl/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxmgl
+#  rm -f -r $WXDEST/wxmgl
 
   echo Now try the RPMs with rpm -i.
 }
@@ -185,7 +190,7 @@
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxmotif/release/*.tar.gz $WXDEST
   cp $WXDEST/wxmotif/release/*.tar.bz2 $WXDEST
 
@@ -203,7 +208,7 @@
   bzip2 -f9 ../wxMotif-$WXVER.tar
   cd ..
   rm -f -r wxMotif.tmp
-  rm -f -r $WXDEST/wxmotif
+#  rm -f -r $WXDEST/wxmotif
 
   echo Now try the RPMs with rpm -i.
 }
@@ -304,11 +309,11 @@
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxbase/release/*.tar.gz $WXDEST
   cp $WXDEST/wxbase/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxbase
+#  rm -f -r $WXDEST/wxbase
   echo Now try the RPMs with rpm -i.
 }
 
@@ -365,11 +370,11 @@
   ls RPMS/i386
 
   cp $RPM_ROOT/SRPMS/*.rpm $WXDEST
-  cp $RPM_ROOT/RPMS/*.rpm $WXDEST
+  cp $RPM_ROOT/RPMS/i386/*.rpm $WXDEST
   cp $WXDEST/wxx11/release/*.tar.gz $WXDEST
   cp $WXDEST/wxx11/release/*.tar.bz2 $WXDEST
 
-  rm -f -r $WXDEST/wxx11
+#  rm -f -r $WXDEST/wxx11
   echo Now try the RPMs with rpm -i.
 }
 
@@ -379,7 +384,9 @@
 WXVER=$3
 
 SPINWXX11=0
-SPINWXGTK=0
+SPINWXGTK1=0
+SPINWXGTK2=0
+SPINWXGTK2UNICODE=0
 SPINWXMAC=0
 SPINWXMOTIF=0
 SPINWXBASE=0
@@ -391,15 +398,17 @@
 {
     echo Usage: $PROGNAME "src-dir dest-dir version-number [ options ]"
     echo Options:
-    echo "    --help         Display this help message"
-    echo "    --wxgtk        Spin wxGTK RPMs"
-    echo "    --wxbase       Spin wxBase RPMs"
-    echo "    --wxx11        Spin wxX11 RPMs"
-    echo "    --wxmotif      Spin wxMotif RPMs"
-    echo "    --wxmgl        Spin wxMGL RPMs"
-    echo "    --wxmac        Make wxMac tarball"
-    echo "    --all          Spin EVERYTHING"
-    echo "    --updatecvs    Update from CVS"
+    echo "    --help          Display this help message"
+    echo "    --wxgtk1        Spin wxGTK1 RPMs"
+    echo "    --wxgtk2        Spin wxGTK2 RPMs"
+    echo "    --wxgtk2unicode Spin wxGTK2 Unicode RPMs"
+    echo "    --wxbase        Spin wxBase RPMs"
+    echo "    --wxx11         Spin wxX11 RPMs"
+    echo "    --wxmotif       Spin wxMotif RPMs"
+    echo "    --wxmgl         Spin wxMGL RPMs"
+    echo "    --wxmac         Make wxMac tarball"
+    echo "    --all           Spin EVERYTHING"
+    echo "    --updatecvs     Update from CVS"
 
     exit 1
 }
@@ -428,7 +437,9 @@
 for i in "$@"; do
     case "$i" in
 	--wxx11) SPINWXX11=1 ;;
-	--wxgtk) SPINWXGTK=1 ;;
+	--wxgtk1) SPINWXGTK1=1 ;;
+	--wxgtk2) SPINWXGTK2=1 ;;
+	--wxgtk2unicode) SPINWXGTK2UNICODE=1 ;;
 	--wxmotif) SPINWXMOTIF=1 ;;
 	--wxmgl) SPINWXMGL=1 ;;
 	--wxmac) SPINWXMAC=1 ;;
@@ -442,7 +453,7 @@
     esac
 done
 
-echo About to make wxWindows RPMs:
+echo About to make wxWidgets RPMs:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER
@@ -457,7 +468,21 @@
   dospinwxx11
 fi
 
-if [ "$SPINWXGTK" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+if [ "$SPINWXGTK1" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS=
+  PLATFORM=gtk1
+  dospinwxgtk
+fi
+
+if [ "$SPINWXGTK2" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS="--with gtk2"
+  PLATFORM=gtk2
+  dospinwxgtk
+fi
+
+if [ "$SPINWXGTK2UNICODE" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  RPMBUILDARGS="--with gtk2 --with unicode"
+  PLATFORM=gtk2unicode
   dospinwxgtk
 fi
 

Index: internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript
diff -u internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript:2.1.5.1 internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript:2.2
--- internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M5mcp2xml.applescript	Wed Sep 22 14:21:07 2004
@@ -4,7 +4,7 @@
 -- Author:      Gilles Depeyrot
 -- Modified by:
 -- Created:     28.11.2001
--- RCS-ID:      $Id: M5mcp2xml.applescript,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+-- RCS-ID:      $Id: M5mcp2xml.applescript,v 2.2 2004/09/22 21:21:07 heikki Exp $
 -- Copyright:   (c) 2001 Gilles Depeyrot
 -- Licence:     wxWindows licence
 -----------------------------------------------------------------------------

Index: internal/wxPython-2.5/docs/wine/licence.txt
diff -u internal/wxPython-2.5/docs/wine/licence.txt:2.1.5.1 internal/wxPython-2.5/docs/wine/licence.txt:2.2
--- internal/wxPython-2.5/docs/wine/licence.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/wine/licence.txt	Wed Sep 22 14:21:16 2004
@@ -1,6 +1,6 @@
 
 
-wxWindows Library License, Version 3
+wxWidgets Library License, Version 3
 ====================================
      
   Copyright (C) 1998 Julian Smart, Robert Roebling et al. 
@@ -30,7 +30,7 @@
  
   1. As a special exception, the copyright holders of this library give 
   permission for additional uses of the text contained in this release of 
-  the library as licensed under the wxWindows Library License, applying 
+  the library as licensed under the wxWidgets Library License, applying 
   either version 3 of the License, or (at your option) any later version of 
   the License as published by the copyright holders of version 3 of the 
   License document. 

Index: internal/wxPython-2.5/distrib/msw/tmake/bcc.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/bcc.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/bcc.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/bcc.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/bcc.t	Wed Sep 22 14:21:03 2004
@@ -9,7 +9,7 @@
 #!
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: bcc.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: bcc.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 
 #${

Index: internal/wxPython-2.5/distrib/msw/tmake/univ.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/univ.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/univ.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/univ.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/univ.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxUniversal library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 26.06.01
-#! Version: $Id: univ.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: univ.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/mgl/install.txt
diff -u internal/wxPython-2.5/docs/mgl/install.txt:2.1.5.1 internal/wxPython-2.5/docs/mgl/install.txt:2.2
--- internal/wxPython-2.5/docs/mgl/install.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/mgl/install.txt	Wed Sep 22 14:21:09 2004
@@ -1,4 +1,4 @@
-wxWindows 2.5 for MGL installation
+wxWidgets 2.5 for MGL installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -9,9 +9,9 @@
   mailing wxwin-users or the author. Preferably, try to fix the
   problem first and then send a patch to the author.
   
-  When sending bug reports tell us what version of wxWindows you are 
+  When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMGL 2.5.1, gcc 2.95.3, Redhat 7.0
+  example: wxMGL 2.5.2, gcc 2.95.3, Redhat 7.0
 
 First steps
 -----------
@@ -32,7 +32,7 @@
 
 - Download wxMGL-x.y.z.tgz, where x.y.z is the version number.
   Download documentation in a preferred format, such as
-  wxWindows-HTML.zip or wxWindows-PDF.zip.
+  wxWidgets-HTML.zip or wxWidgets-PDF.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
   directory.
@@ -40,7 +40,7 @@
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles.
 
-- You can now use configure or makefiles to build wxWindows and the samples.
+- You can now use configure or makefiles to build wxWidgets and the samples.
   In case of problems, please use GNU make.
 
 
@@ -58,7 +58,7 @@
 These instructions apply to installation on a Unix system (such as Linux). Please
 see bellow for information on using configure on non-Unix platforms.
 
-If you compile wxWindows on Linux for the first time and don't like to read 
+If you compile wxWidgets on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
 
 > ./configure --with-mgl
@@ -76,7 +76,7 @@
 > ldconfig
 > exit
 
-If you want to remove wxWindows on Unix you can do this:
+If you want to remove wxWidgets on Unix you can do this:
 
 > su <type root password>
 > make uninstall
@@ -96,7 +96,7 @@
 'make install' will install wx-config script that can (and should) be used
 to get compiler flags that are needed to build your program. wx-config --cxxflags
 will output necessary C++ compiler flags and wx-config --libs will list all
-needed libraries. See an example of wxWindows application makefile:
+needed libraries. See an example of wxWidgets application makefile:
 
 minimal: minimal.o
 	$(CC) -o minimal minimal.o `wx-config --libs`
@@ -129,7 +129,7 @@
 > ./configure --with-mgl
 > make
 
-in wxWindows top directory. You can build wxMGL in MS-DOS with configure, sorry.
+in wxWidgets top directory. You can build wxMGL in MS-DOS with configure, sorry.
 
 
 * Building wxMGL for MS-DOS using Watcom C/C++

Index: internal/wxPython-2.5/docs/todo30.txt
diff -u internal/wxPython-2.5/docs/todo30.txt:2.1.5.1 internal/wxPython-2.5/docs/todo30.txt:2.2
--- internal/wxPython-2.5/docs/todo30.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/todo30.txt	Wed Sep 22 14:21:04 2004
@@ -1,4 +1,4 @@
-Enhancements for wxWindows 3.0
+Enhancements for wxWidgets 3.0
 ==============================
 
 This table contains the brief summary of the issues below. Priority and
@@ -18,7 +18,7 @@
 ============
 
 - Namespaces:
-    We want to have all wxWindows identifiers in "wx" namespace but provide
+    We want to have all wxWidgets identifiers in "wx" namespace but provide
     typedefs/#defines for backwards compatibility. This can be done easily
     for the classes and the only real problem are the enums as they would
     all have to be duplicated at both the global scope (with "wx" prefix) and
@@ -32,7 +32,7 @@
     without templates, even if not all of its features would be available then)
 
 - Exceptions
-    We are not going to use exceptions in wxWindows itself but our code should
+    We are not going to use exceptions in wxWidgets itself but our code should
     become exception safe. This is a very difficult task as it means that no
     resource allocations (including memory, files, whatever) should be done
     without using a smart pointer-like object to store the result as it is the
@@ -162,7 +162,7 @@
 - wxLocale Extension (eg Currency)
 - wxStreams review
 - wxURL?
-- a way to tell wxWindows to check for any non-portable usage,
+- a way to tell wxWidgets to check for any non-portable usage,
   for a given set of platforms. Sometimes you want to be able
   to get away with non-portable usage, and sometimes not.
   This is probably way too time-consuming to implement.
@@ -202,4 +202,4 @@
   get closer to native look and feel, e.g. the gradient
   shadow on XP toolbars.
 
-Version:      $Id: todo30.txt,v 2.1.5.1 2004/04/09 01:15:17 markie Exp $
+Version:      $Id: todo30.txt,v 2.2 2004/09/22 21:21:04 heikki Exp $

Index: internal/wxPython-2.5/docs/publicity/announce.txt
diff -u internal/wxPython-2.5/docs/publicity/announce.txt:2.1.5.1 internal/wxPython-2.5/docs/publicity/announce.txt:2.2
--- internal/wxPython-2.5/docs/publicity/announce.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/publicity/announce.txt	Wed Sep 22 14:21:13 2004
@@ -1,19 +1,20 @@
-Announcing wxWidgets 2.5.1: a cross-platform GUI toolkit
+Announcing wxWidgets 2.5.2: a cross-platform GUI toolkit
 ----------------------------------------------------------------
 
-February 24th, 2004 -- the wxWidgets team is pleased to announce
+May 31st, 2004 -- the wxWidgets team is pleased to announce
 a development snapshot release of the mature cross-platform C++
 application framework.
 
 The following platforms are supported:
 
 - Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
-- Windows CE (partial port)
+- Windows CE
 - Linux/Unix/VMS with GTK+ 1.x and 2.0
-- Linux/Unix with X11
+- Linux/Unix with X11 (beta)
 - Linux/Unix with Motif/Lesstif
-- MacOS 9.x and 10.x
-- OS/2
+- Mac OS 9.x and 10.x using Carbon
+- Mac OS 10.x using Cocoa (beta)
+- OS/2 (beta)
 - MGL (Linux and DOS)
 
 A non-GUI subset of wxWidgets called wxBase is also supported
@@ -21,17 +22,19 @@
 
 To get wxWidgets, go to the Download page at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
 
 This is a development snapshot, sometimes known as
-an 'unstable' release. Improvements include:
+an 'unstable' release. Improvements over 2.4.x include:
 numerous bug fixes, STL-like container classes,
 improved GTK+ 2 compatibility, new build system,
 improved Unicode compatibility, wxRenderer class,
 shaped frame and dialog windows on Windows and GTK+,
 more efficient UI update processing, print preview
 improvements, wxCrashReport class, OpenWatcom and
-Digital Mars compiler support, and more.
+Digital Mars compiler support, and more. Improvements
+over 2.5.1 include much improved Mac OS X and Windows CE
+support, as well as the usual bug fixes and minor enhancements.
 
 *** About wxWidgets
 
@@ -72,9 +75,9 @@
 
 If you're considering wxWidgets, do check out some of these links:
 
-    http://www.wxwindows.org/feedback.htm ; Comments from users
-    http://www.wxwindows.org/screensh.htm ; Screenshots
-    http://www.wxwindows.org/users.htm    ; A list of some of our
+    http://www.wxwidgets.org/feedback.htm ; Comments from users
+    http://www.wxwidgets.org/screensh.htm ; Screenshots
+    http://www.wxwidgets.org/users.htm    ; A list of some of our
                                           ; users
 
 Have fun!

Index: internal/wxPython-2.5/docs/base/readme.txt
diff -u internal/wxPython-2.5/docs/base/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/base/readme.txt:2.2
--- internal/wxPython-2.5/docs/base/readme.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/base/readme.txt	Wed Sep 22 14:21:05 2004
@@ -2,7 +2,7 @@
                                 =============
 
 NB: this file applies to wxBase library only. If you are using a GUI version
-    of wxWindows, please refer to the documentation in the appropriate
+    of wxWidgets, please refer to the documentation in the appropriate
     subdirectory (msw, gtk, motif &c).
 
 
@@ -11,7 +11,7 @@
 0. Introduction
 ---------------
 
- wxBase is the library providing most of the non-GUI classes of the wxWindows
+ wxBase is the library providing most of the non-GUI classes of the wxWidgets
 cross-platform C++ framework. wxBase has some generic classes such as yet
 another C++ string class, typesafe dynamic arrays, hashes and lists and, more
 excitingly, wxDateTime -- a very flexible and powerful class for manipulating
@@ -87,7 +87,7 @@
 3. Installing under Unix/BeOS
 -----------------------------
 
-NB: If you're building wxBase from the wxWindows distribution and not from a
+NB: If you're building wxBase from the wxWidgets distribution and not from a
     separate wxBase one you will need to add "--disable-gui" to configure
     arguments below!
 
@@ -96,7 +96,7 @@
 
 The recommended way to build wxBase is:
 
-        % cd ..../wxWindows
+        % cd ..../wxWidgets
         % mkdir base-release # or any other directory of your liking
         % cd base-release
         % ../configure
@@ -121,17 +121,17 @@
 wxBase classes. It doesn't do anything useful per itself but you may want to
 look at its code to see examples of usage of the class you are interested in.
 
- There is no separate documentation for wxBase, please refer to wxWindows
+ There is no separate documentation for wxBase, please refer to wxWidgets
 documentation instead.
 
- Support for wxBase is available from the same places as for wxWindows itself,
+ Support for wxBase is available from the same places as for wxWidgets itself,
 namely:
 
 * Usenet newsgroup comp.soft-sys.wxwindows
 
 * Mailing lists: see http://lists.wxwindows.org/ for more information
 
-* WWW page: http://www.wxwindows.org/
+* WWW page: http://www.wxwidgets.org/
 
 
  Hope you will find wxBase useful!

Index: internal/wxPython-2.5/docs/msw/readme.txt
diff -u internal/wxPython-2.5/docs/msw/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/readme.txt:2.2
--- internal/wxPython-2.5/docs/msw/readme.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/readme.txt	Wed Sep 22 14:21:11 2004
@@ -1,8 +1,8 @@
-This is wxWindows for Windows (wxMSW)
+This is wxWidgets for Windows (wxMSW)
 -------------------------------------
 
-For information on installing wxWindows, please see install.txt.
+For information on installing wxWidgets, please see install.txt.
 
 For further information, please see docs/html/index.htm and the
-wxWindows reference manual.
+wxWidgets reference manual.
 

Index: internal/wxPython-2.5/docs/preamble.txt
diff -u internal/wxPython-2.5/docs/preamble.txt:2.1.5.1 internal/wxPython-2.5/docs/preamble.txt:2.2
--- internal/wxPython-2.5/docs/preamble.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/preamble.txt	Wed Sep 22 14:21:04 2004
@@ -1,23 +1,23 @@
 Preamble
 ========
 
-The licensing of the wxWindows library is intended to protect the wxWindows
+The licensing of the wxWidgets library is intended to protect the wxWidgets
 library, its developers, and its users, so that the considerable investment
 it represents is not abused.
 
-Under the terms of the wxWindows Licence, you as a user are not
-obliged to distribute wxWindows source code with your products, if you
+Under the terms of the wxWidgets Licence, you as a user are not
+obliged to distribute wxWidgets source code with your products, if you
 distribute these products in binary form. However, you are prevented from
 restricting use of the library in source code form, or denying others the
-rights to use or distribute wxWindows library source code in the way
+rights to use or distribute wxWidgets library source code in the way
 intended.
 
-The wxWindows Licence establishes the copyright for the code and related
+The wxWidgets Licence establishes the copyright for the code and related
 material, and it gives you legal permission to copy, distribute and/or
 modify the library. It also asserts that no warranty is given by the authors
 for this or derived code.
 
-The core distribution of the wxWindows library contains files
+The core distribution of the wxWidgets library contains files
 under two different licences:
 
 - Most files are distributed under the GNU Library General Public
@@ -27,7 +27,7 @@
   different licence), and distribute such binaries under your own
   terms.
 
-- Most core wxWindows manuals are made available under the "wxWindows
+- Most core wxWidgets manuals are made available under the "wxWidgets
   Free Documentation Licence", which allows you to distribute modified
   versions of the manuals, such as versions documenting any modifications
   made by you in your version of the library. However, you may not restrict
@@ -36,11 +36,11 @@
 
 Other relevant files:
 
-- licence.txt: a statement that the wxWindows library is
+- licence.txt: a statement that the wxWidgets library is
   covered by the GNU Library General Public Licence, with an
   exception notice for binary distribution.
 
-- licendoc.txt: the wxWindows Documentation Licence.
+- licendoc.txt: the wxWidgets Documentation Licence.
 
 - lgpl.txt: the text of the GNU Library General Public Licence.
 

Index: internal/wxPython-2.5/distrib/msw/tmake/vc6app.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/vc6app.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/vc6app.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/vc6app.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/vc6app.t	Wed Sep 22 14:21:03 2004
@@ -10,7 +10,7 @@
 #!          (in the last example all configurations will be included)
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
-#! Version: $Id: vc6app.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: vc6app.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! what kind of app are we building - this is used as prefix for the build

Index: internal/wxPython-2.5/distrib/msw/makefile.vc
diff -u internal/wxPython-2.5/distrib/msw/makefile.vc:2.1.5.1 internal/wxPython-2.5/distrib/msw/makefile.vc:2.2
--- internal/wxPython-2.5/distrib/msw/makefile.vc:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/makefile.vc	Wed Sep 22 14:21:02 2004
@@ -6,7 +6,7 @@
 #
 # "%W% %G%"
 #
-# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Makefile : Builds wxWidgets library wx.lib for VC++ (32-bit)
 # Arguments:
 #
 # FINAL=1 argument to nmake to build version with no debugging info.
@@ -25,7 +25,7 @@
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:	wxhtml
 htb:	$(DOCDIR)\htb\wx.htb
-wxhtml:	$(DOCDIR)\html\wx\wx.htm
+wxhtml:	$(DOCDIR)\html\wx\wx_contents.html
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps
 wxps:	$(WXDIR)\docs\ps\wx.ps
@@ -111,7 +111,7 @@
 
 # This target does two sets of HTML: one using a style sheet, for
 # the purposes of the CHM file, and one without.
-$(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
+$(DOCDIR)\html\wx\wx_contents.html:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
@@ -126,7 +126,7 @@
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx.hhp
 	cd $(DOCDIR)\mshtml\wx
     copy $(DOCDIR)\latex\wx\wx.css .
 	-hhc wx.hhp
@@ -171,10 +171,10 @@
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
-$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
+$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx_contents.html
 	cd $(WXDIR)\docs\html\wx
     -erase wx.zip wx.htb
-    zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    zip wx.zip *.html *.gif *.hhp *.hhc *.hhk
     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
@@ -188,7 +188,7 @@
 cleandocs:
     -erase $(DOCDIR)\winhelp\wx.hlp
     -erase $(DOCDIR)\winhelp\wx.cnt
-    -erase $(DOCDIR)\html\wx\*.htm
+    -erase $(DOCDIR)\html\wx\*.html
     -erase $(DOCDIR)\pdf\wx.rtf
     -erase $(DOCDIR)\latex\wx\wx.rtf
     -erase $(DOCDIR)\latex\wx\WX.PH
@@ -198,7 +198,7 @@
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf
-    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+    start $(WAITFLAG) "winword d:\wx2\wxWidgets\docs\latex\pdf\wx.rtf /mGeneratePDF"
 
 
 MFTYPE=vc

Index: internal/wxPython-2.5/distrib/msw/tmake/b32.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/b32.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/b32.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/b32.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/b32.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t b32 wxwin.pro
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: b32.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: b32.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 
 #${

Index: internal/wxPython-2.5/distrib/msw/tmake/os2.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/os2.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/os2.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/os2.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/os2.t	Wed Sep 22 14:21:03 2004
@@ -5,7 +5,7 @@
 #! Author:  Vadim Zeitlin
 #!          modified by Stefan Neis for OS/2
 #! Created: 28.01.00
-#! Version: $Id: os2.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: os2.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/gtk/licence.txt
diff -u internal/wxPython-2.5/docs/gtk/licence.txt:2.1.5.1 internal/wxPython-2.5/docs/gtk/licence.txt:2.2
--- internal/wxPython-2.5/docs/gtk/licence.txt:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/gtk/licence.txt	Wed Sep 22 14:21:06 2004
@@ -1,6 +1,6 @@
 
 
-wxWindows Library License, Version 3
+wxWidgets Library License, Version 3
 ====================================
      
   Copyright (C) 1998 Julian Smart, Robert Roebling et al. 
@@ -30,7 +30,7 @@
  
   1. As a special exception, the copyright holders of this library give 
   permission for additional uses of the text contained in this release of 
-  the library as licensed under the wxWindows Library License, applying 
+  the library as licensed under the wxWidgets Library License, applying 
   either version 3 of the License, or (at your option) any later version of 
   the License as published by the copyright holders of version 3 of the 
   License document. 

Index: internal/wxPython-2.5/distrib/msw/makeall.bat
diff -u internal/wxPython-2.5/distrib/msw/makeall.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/makeall.bat:2.2
--- internal/wxPython-2.5/distrib/msw/makeall.bat:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/makeall.bat	Wed Sep 22 14:21:02 2004
@@ -1,5 +1,5 @@
 Rem @echo off
-Rem This script compiles wxWindows and some samples/demos with
+Rem This script compiles wxWidgets and some samples/demos with
 Rem a range of compilers.
 Rem Note that it currently uses batch scripts local to Julian Smart's machine,
 Rem to set up the environment correctly.
@@ -19,7 +19,7 @@
 Rem Not working in 4NT?
 Rem if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=c:\wx2sta~1\wxwind~1
 
-echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
+echo Full wxWidgets path is %FULLWXWIN%, FAT path is %FATWXWIN%
 set BUILDDEST=%TEMP%\wxWinBuild
 Rem Only carry on if we haven't specified a single target
 set CARRYON=0
@@ -50,7 +50,7 @@
 cd %WXDIR%\utils\tex2rtf\src
 erase /S *.exe
 
-echo Starting wxWindows build at %_TIME, %_DATE
+echo Starting wxWidgets build at %_TIME, %_DATE
 
 Rem First, VC++ 6.
 
@@ -490,7 +490,7 @@
 Rem Set up the environment
 call msvc1
 
-Rem Needs full wxWindows path for making libraries
+Rem Needs full wxWidgets path for making libraries
 set WXWIN=%FULLWXWIN%
 
 echo *** VC++ Debug ***
@@ -504,7 +504,7 @@
 Rem Make one sample, just to make sure Debug mode is OK
 cd %WXDIR%\samples\minimal
 nmake -f makefile.dos clean
-Rem Needs FAT wxWindows path for making executables
+Rem Needs FAT wxWidgets path for making executables
 set WXWIN=%FATWXWIN%
 nmake -f makefile.dos
 
@@ -514,7 +514,7 @@
 cd %WXDIR%\src\msw
 nmake -f makefile.dos cleanall
 
-Rem Needs full wxWindows path for making libraries
+Rem Needs full wxWidgets path for making libraries
 set WXWIN=%FULLWXWIN%
 
 echo *** VC++ Release ***
@@ -529,7 +529,7 @@
 cd %WXDIR%\samples\minimal
 nmake -f makefile.dos clean
 nmake -f makefile.dos FINAL=1
-Rem Needs FAT wxWindows path for making executables
+Rem Needs FAT wxWidgets path for making executables
 set WXWIN=%FATWXWIN%
 nmake -f makefile.dos FINAL=1
 copy minimal.exe /S %BUILDDEST%\VC1Release
@@ -591,5 +591,5 @@
 
 :end
 
-echo Finished wxWindows build at %_TIME, %_DATE
+echo Finished wxWidgets build at %_TIME, %_DATE
 

Index: internal/wxPython-2.5/distrib/msw/tarwxall
diff -u internal/wxPython-2.5/distrib/msw/tarwxall:2.1.5.1 internal/wxPython-2.5/distrib/msw/tarwxall:2.2
--- internal/wxPython-2.5/distrib/msw/tarwxall:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tarwxall	Wed Sep 22 14:21:02 2004
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -66,24 +66,24 @@
 
 ### wxAll: all distributions in one giant archive
 cd $1
-cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/wince.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/cocoa.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt
 $TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
 
 echo Re-tarring wxAll in a subdirectory...
 cd $2
-rm -f -r wxWindows-${WXVER}
-mkdir wxWindows-${WXVER}
+rm -f -r wxWidgets-${WXVER}
+mkdir wxWidgets-${WXVER}
 
 # If we have the full set of VC++ project files,
 # get them
-if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
+if [ -f $2/extra/wxWidgets-${WXVER}-VC.zip ]; then
+  unzip -o $2/extra/wxWidgets-${WXVER}-VC.zip
 else
-  echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
+  echo "Warning - did not find $2/deliver/extra/wxWidgets-${WXVER}-VC.zip"
 fi
 
-cd wxWindows-${WXVER}
+cd wxWidgets-${WXVER}
 $TAR xf ../wxAll-${WXVER}.tar
 
 # Translate all .dsp and .dsw files to DOS format
@@ -105,7 +105,7 @@
 cd ..
 
 rm -f wxAll-${WXVER}.tar
-$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
 gzip $2/wxAll-${WXVER}.tar
 

Index: internal/wxPython-2.5/distrib/msw/tmake/gtk.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/gtk.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/gtk.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/gtk.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/gtk.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxGTK library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 28.01.00
-#! Version: $Id: gtk.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: gtk.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/vc6univ.t	Wed Sep 22 14:21:03 2004
@@ -5,7 +5,7 @@
 #!                  tmake -t vc6univ wxwin.pro -o wxUniv.dsp
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
-#! Version: $Id: vc6univ.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: vc6univ.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
 #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/makedist.sh
diff -u internal/wxPython-2.5/distrib/msw/makedist.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/makedist.sh:2.2
--- internal/wxPython-2.5/distrib/msw/makedist.sh:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/makedist.sh	Wed Sep 22 14:21:02 2004
@@ -1,7 +1,7 @@
 #! /bin/bash
 # makedist.sh
 #
-# Build wxWindows 2 for Windows distribution.
+# Build wxWidgets 2 for Windows distribution.
 # This builds all required binaries and documents before calling
 # zipdist.sh to make the archives.
 #
@@ -19,7 +19,7 @@
 # - update the readmes, change log, manual version etc.
 # - update version.h
 # - update distrib/msw/wisetop.txt, wisebott.txt with the correct version
-#   number, plus any hard-wired wxWindows paths
+#   number, plus any hard-wired wxWidgets paths
 # - test on a variety of compilers
 #
 # TODO:
@@ -96,7 +96,7 @@
 build_docs() {
     cd "$SRC/src/msw"
     echo "---------------------------------"
-    echo "Building wxWindows documents"
+    echo "Building wxWidgets documents"
     nmake -f makefile.vc cleandocs docs
 
     cd "$SRC/utils/tex2rtf/src"
@@ -113,7 +113,7 @@
 # This has to be interactive at present.
 build_pdf() {
     echo "---------------------------------"
-    echo "Building wxWindows PDF documents"
+    echo "Building wxWidgets PDF documents"
     if [ -e "$WORDEXE" ]; then
         "$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf"
         "$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf"
@@ -124,12 +124,12 @@
     fi
 }
 
-# Build wxWindows
+# Build wxWidgets
 build_wxwin_vc() {
     echo "---------------------------------"
-    echo "Building wxWindows using VC++"
+    echo "Building wxWidgets using VC++"
     cd "$SRC/src"
-    echo Building wxWindows Release library in `pwd`
+    echo Building wxWidgets Release library in `pwd`
     echo Command: msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild
     msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild | egrep -v "$WARNINGS"
 }

Index: internal/wxPython-2.5/distrib/msw/tmake/dos.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/dos.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/dos.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/dos.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/dos.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t dos wxwin.pro -o makefile.dos
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: dos.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: dos.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/distrib/msw/tmake/msw.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/msw.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/msw.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/msw.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/msw.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMSW library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 28.01.00
-#! Version: $Id: msw.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: msw.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/cocoa/readme.txt
diff -u internal/wxPython-2.5/docs/cocoa/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/cocoa/readme.txt:2.2
--- internal/wxPython-2.5/docs/cocoa/readme.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/cocoa/readme.txt	Wed Sep 22 14:21:06 2004
@@ -2,7 +2,7 @@
 
 wxCocoa is still very much a work in progress.  At this point quite a bit
 of functionality is working, but quite a bit is left to do.  wxCocoa is not
-yet suitable for a direct port of most wxWindows applications. Fortunately,
+yet suitable for a direct port of most wxWidgets applications. Fortunately,
 wxMac is available for those looking to move to Mac today.
 
 If you're still reading then I assume you're interested in helping with

Index: internal/wxPython-2.5/docs/msw/winxp.txt
diff -u internal/wxPython-2.5/docs/msw/winxp.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/winxp.txt:2.2
--- internal/wxPython-2.5/docs/msw/winxp.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/winxp.txt	Wed Sep 22 14:21:11 2004
@@ -1,15 +1,15 @@
-Microsoft Windows XP Support from wxWindows
+Microsoft Windows XP Support from wxWidgets
 -------------------------------------------
 
 Windows XP introduces the themes (called "visual styles" in the Microsoft
-documentation) in Windows world. As wxWindows uses the standard Windows
+documentation) in Windows world. As wxWidgets uses the standard Windows
 controls for most of its classes, it can take advantage of it without
 (almost) any effort from your part. The only thing you need to do if you
 want your program to honour the visual style setting of Windows XP is to
 add the manifest file to your program (this is not at all specific to
-wxWindows programs but is required for all Windows applications).
+wxWidgets programs but is required for all Windows applications).
 
-wxWindows now includes manifest resources in wx.rc, so it should be enough to
+wxWidgets now includes manifest resources in wx.rc, so it should be enough to
 include "wx/msw/wx.rc" in your application's resource file and you get
 XP look automatically. If it doesn't work, follow the instructions below:
 
@@ -34,7 +34,7 @@
     name="Controls"
     type="win32"
 />
-<description>Controls: wxWindows sample application</description>
+<description>Controls: wxWidgets sample application</description>
 <dependency>
     <dependentAssembly>
         <assemblyIdentity
@@ -51,7 +51,7 @@
 --- cut here ---
 
 
-There are a few minor problems with theme support in wxWindows currently
+There are a few minor problems with theme support in wxWidgets currently
 which will be fixed in the next releases:
 
 - the buttons with non-default colours are owner-drawn and thus don't

Index: internal/wxPython-2.5/distrib/msw/dmc.rsp
diff -u /dev/null internal/wxPython-2.5/distrib/msw/dmc.rsp:2.1
--- /dev/null	Wed Sep 22 14:21:19 2004
+++ internal/wxPython-2.5/distrib/msw/dmc.rsp	Wed Sep 22 14:21:02 2004
@@ -0,0 +1,140 @@
+build/msw/config.dmc
+build/msw/makefile.dmc
+contrib/build/animate/makefile.dmc
+contrib/build/deprecated/makefile.dmc
+contrib/build/fl/makefile.dmc
+contrib/build/gizmos/makefile.dmc
+contrib/build/mmedia/makefile.dmc
+contrib/build/net/makefile.dmc
+contrib/build/ogl/makefile.dmc
+contrib/build/plot/makefile.dmc
+contrib/build/stc/makefile.dmc
+contrib/build/svg/makefile.dmc
+contrib/build/xrc/makefile.dmc
+contrib/samples/animate/makefile.dmc
+contrib/samples/deprecated/proplist/makefile.dmc
+contrib/samples/deprecated/resource/makefile.dmc
+contrib/samples/deprecated/treelay/makefile.dmc
+contrib/samples/fl/makefile.dmc
+contrib/samples/gizmos/dynsash/makefile.dmc
+contrib/samples/gizmos/dynsash_switch/makefile.dmc
+contrib/samples/gizmos/editlbox/makefile.dmc
+contrib/samples/gizmos/led/makefile.dmc
+contrib/samples/gizmos/multicell/makefile.dmc
+contrib/samples/gizmos/splittree/makefile.dmc
+contrib/samples/mmedia/makefile.dmc
+contrib/samples/ogl/ogledit/makefile.dmc
+contrib/samples/ogl/studio/makefile.dmc
+contrib/samples/plot/makefile.dmc
+contrib/samples/stc/makefile.dmc
+contrib/samples/svg/makefile.dmc
+contrib/samples/xrc/makefile.dmc
+contrib/utils/convertrc/makefile.dmc
+contrib/utils/wxrc/makefile.dmc
+contrib/utils/wxrcedit/makefile.dmc
+demos/bombs/makefile.dmc
+demos/dbbrowse/makefile.dmc
+demos/forty/makefile.dmc
+demos/fractal/makefile.dmc
+demos/life/makefile.dmc
+demos/makefile.dmc
+demos/poem/makefile.dmc
+samples/access/makefile.dmc
+samples/artprov/makefile.dmc
+samples/calendar/makefile.dmc
+samples/caret/makefile.dmc
+samples/checklst/makefile.dmc
+samples/config/makefile.dmc
+samples/console/makefile.dmc
+samples/controls/makefile.dmc
+samples/db/makefile.dmc
+samples/dialogs/makefile.dmc
+samples/dialup/makefile.dmc
+samples/display/makefile.dmc
+samples/dnd/makefile.dmc
+samples/docview/makefile.dmc
+samples/docvwmdi/makefile.dmc
+samples/dragimag/makefile.dmc
+samples/drawing/makefile.dmc
+samples/dynamic/makefile.dmc
+samples/erase/makefile.dmc
+samples/event/makefile.dmc
+samples/except/makefile.dmc
+samples/exec/makefile.dmc
+samples/font/makefile.dmc
+samples/grid/makefile.dmc
+samples/help/makefile.dmc
+samples/htlbox/makefile.dmc
+samples/html/about/makefile.dmc
+samples/html/help/makefile.dmc
+samples/html/helpview/makefile.dmc
+samples/html/htmlctrl/makefile.dmc
+samples/html/makefile.dmc
+samples/html/printing/makefile.dmc
+samples/html/test/makefile.dmc
+samples/html/virtual/makefile.dmc
+samples/html/widget/makefile.dmc
+samples/html/zip/makefile.dmc
+samples/image/makefile.dmc
+samples/internat/makefile.dmc
+samples/ipc/makefile.dmc
+samples/joytest/makefile.dmc
+samples/keyboard/makefile.dmc
+samples/layout/makefile.dmc
+samples/listbox/makefile.dmc
+samples/listctrl/makefile.dmc
+samples/makefile.dmc
+samples/mdi/makefile.dmc
+samples/memcheck/makefile.dmc
+samples/menu/makefile.dmc
+samples/mfc/makefile.dmc
+samples/minifram/makefile.dmc
+samples/minimal/makefile.dmc
+samples/mobile/makefile.dmc
+samples/mobile/styles/makefile.dmc
+samples/mobile/wxedit/makefile.dmc
+samples/multimon/makefile.dmc
+samples/nativdlg/makefile.dmc
+samples/notebook/makefile.dmc
+samples/oleauto/makefile.dmc
+samples/opengl/cube/makefile.dmc
+samples/opengl/isosurf/makefile.dmc
+samples/opengl/makefile.dmc
+samples/opengl/penguin/makefile.dmc
+samples/ownerdrw/makefile.dmc
+samples/png/makefile.dmc
+samples/printing/makefile.dmc
+samples/propsize/makefile.dmc
+samples/regtest/makefile.dmc
+samples/render/makefile.dmc
+samples/richedit/makefile.dmc
+samples/rotate/makefile.dmc
+samples/rttitest/makefile.dmc
+samples/sashtest/makefile.dmc
+samples/scroll/makefile.dmc
+samples/scrollsub/makefile.dmc
+samples/shaped/makefile.dmc
+samples/sockets/makefile.dmc
+samples/sound/makefile.dmc
+samples/splash/makefile.dmc
+samples/splitter/makefile.dmc
+samples/statbar/makefile.dmc
+samples/tab/makefile.dmc
+samples/taskbar/makefile.dmc
+samples/text/makefile.dmc
+samples/thread/makefile.dmc
+samples/toolbar/makefile.dmc
+samples/treectrl/makefile.dmc
+samples/typetest/makefile.dmc
+samples/validate/makefile.dmc
+samples/vscroll/makefile.dmc
+samples/widgets/makefile.dmc
+samples/wizard/makefile.dmc
+tests/makefile.dmc
+utils/configtool/src/makefile.dmc
+utils/emulator/src/makefile.dmc
+utils/HelpGen/src/makefile.dmc
+utils/helpview/src/makefile.dmc
+utils/hhp2cached/makefile.dmc
+utils/makefile.dmc
+utils/tex2rtf/src/makefile.dmc

Index: internal/wxPython-2.5/docs/tech/tn0001.txt
diff -u internal/wxPython-2.5/docs/tech/tn0001.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0001.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0001.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0001.txt	Wed Sep 22 14:21:14 2004
@@ -1,4 +1,4 @@
-                    How to add a new sample to wxWindows.
+                    How to add a new sample to wxWidgets.
                     =====================================
 
 To add a new sample "foo" under directory "samples/foo" you need to do
@@ -42,7 +42,7 @@
    by running "autoconf" on a Unix system in the corresponding directory.
 
 5. Add a short description of what the sample does and how does it work
-   to the "samples overview" section in the wxWindows manual. That section
+   to the "samples overview" section in the wxWidgets manual. That section
    lives in docs/latex/wx/tsamples.tex; look at the descriptions for other
    samples, if you are not familiar with LaTeX.
 
@@ -52,4 +52,4 @@
 === EOF ===
 
 Author:  VZ
-Version: $Id: tn0001.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0001.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/docs/mac/readme.txt
diff -u internal/wxPython-2.5/docs/mac/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/mac/readme.txt:2.2
--- internal/wxPython-2.5/docs/mac/readme.txt:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/readme.txt	Wed Sep 22 14:21:07 2004
@@ -1,20 +1,20 @@
-Welcome to wxWindows/Mac 2
+Welcome to wxWidgets/Mac 2
 
-More Information is available from the wxWindows project home page at
+More Information is available from the wxWidgets project home page at
 
-http://www.wxwindows.org 
+http://www.wxwidgets.org 
 
 For more information, please see install.txt, todo.txt, and the
 manuals.
 
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
-on how to subscribe is available from the wxWindows.org homepage.
+bug reports or comments to the wxWidgets users list. Information 
+on how to subscribe is available from the wxWidgets.org homepage.
 
 Questions/Problems related directly to the mac port can be sent directly
 csomor at advancedconcepts.ch.
 
-wxWindows/Mac doesn't come with any guarantee whatsoever. It 
+wxWidgets/Mac doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.
 

Index: internal/wxPython-2.5/distrib/msw/tmake/vc6base.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/vc6base.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/vc6base.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/vc6base.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/vc6base.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          tmake -t vc6base wxwin.pro -o wxBase.dsp
 #! Author:  Vadim Zeitlin
 #! Created: 27.11.99
-#! Version: $Id: vc6base.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: vc6base.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     use lib './lib';

Index: internal/wxPython-2.5/docs/univ/readme.txt
diff -u internal/wxPython-2.5/docs/univ/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/univ/readme.txt:2.2
--- internal/wxPython-2.5/docs/univ/readme.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/univ/readme.txt	Wed Sep 22 14:21:15 2004
@@ -10,10 +10,10 @@
 0. Introduction
 ---------------
 
-wxUniversal is a port of wxWindows which implements the various GUI controls
-by drawing them itself (using low level wxWindows classes). Please see
+wxUniversal is a port of wxWidgets which implements the various GUI controls
+by drawing them itself (using low level wxWidgets classes). Please see
 
-                     http://www.wxwindows.org/wxuniv.htm
+                     http://www.wxwidgets.org/wxuniv.htm
 
 for more details about it.
 
@@ -23,17 +23,17 @@
 look completely differently without changing a single line of its code but
 just changing the theme.
 
-Another advantage is that it makes writing ports of wxWindows for other
+Another advantage is that it makes writing ports of wxWidgets for other
 platforms (such as OS/2, BeOS or QNX) much simpler, so it is of special
-interest to people interested in porting wxWindows to another platform.
+interest to people interested in porting wxWidgets to another platform.
 
 However, wxUniversal doesn't have a 100% native look and feel unlike the
-other wxWindows ports - this is the price to pay for the extra flexibility.
+other wxWidgets ports - this is the price to pay for the extra flexibility.
 
 1. Requirements and supported platforms
 ---------------------------------------
 
-wxUniversal is used together with another wxWindows port which provides the
+wxUniversal is used together with another wxWidgets port which provides the
 "low level classes" mentioned above. Currently it can be built with wxMSW,
 wxGTK or wxX11. In any case, you should download the sources for the
 appropriate toolkit in addition to wxUniversal - in fact, you should download
@@ -57,7 +57,7 @@
 
    Please refer to the Unix section below
 
-** the instructions may be out of date as for wxWindows 2.5.1+ **
+** the instructions may be out of date as for wxWidgets 2.5.2+ **
 
 c) Other compilers
    Borland: 
@@ -112,22 +112,22 @@
 5. Documentation and support
 ----------------------------
 
-Please note that wxUniversal is not as mature as the other wxWindows ports
+Please note that wxUniversal is not as mature as the other wxWidgets ports
 and is currently officially in alpha stage. In particular, it is not really
 intended for the end users but rather for developers at the current stage and
 this is why we don't provide any binaries for it.
 
-There is no separate documentation for wxUniversal, please refer to wxWindows
+There is no separate documentation for wxUniversal, please refer to wxWidgets
 documentation instead.
 
-Support for wxUniversal is available from the same places as for wxWindows
+Support for wxUniversal is available from the same places as for wxWidgets
 itself, namely:
 
 * Usenet newsgroup comp.soft-sys.wxwindows
 
 * Mailing lists: see http://lists.wxwindows.org/ for more information
 
-* WWW page: http://www.wxwindows.org/
+* WWW page: http://www.wxwidgets.org/
 
 
  Hope you find wxUniversal useful!

Index: internal/wxPython-2.5/distrib/msw/tmake/filelist.txt
diff -u internal/wxPython-2.5/distrib/msw/tmake/filelist.txt:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/filelist.txt:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/filelist.txt:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/filelist.txt	Wed Sep 22 14:21:03 2004
@@ -3,7 +3,7 @@
 # Purpose: The list of source files for MSW version of wxWindows.
 # Author:  Vadim Zeitlin
 # Created: 14.07.99
-# Version: $Id: filelist.txt,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+# Version: $Id: filelist.txt,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #
 # Format of this file: TAB separated columns. The first column contains the
 # filename, the second the file type (roughly corresponds to the directory)

Index: internal/wxPython-2.5/docs/tech/tn0010.htm
diff -u internal/wxPython-2.5/docs/tech/tn0010.htm:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0010.htm:2.2
--- internal/wxPython-2.5/docs/tech/tn0010.htm:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0010.htm	Wed Sep 22 14:21:14 2004
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>Compiling wxWindows applications in the VC++ IDE</TITLE>
+<TITLE>Compiling wxWidgets applications in the VC++ IDE</TITLE>
 
 </HEAD>
 
@@ -15,7 +15,7 @@
 <tr>
 <td bgcolor="#C4ECF9">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
-Compiling wxWindows applications in the VC++ IDE
+Compiling wxWidgets applications in the VC++ IDE
 </font>
 </td>
 </tr>
@@ -24,12 +24,12 @@
 <P>
 
 <CENTER>
-<a href="#wxwin2">Settings for wxWindows 2.2</a> / <a href="#wxwin1">Settings for wxWindows 1.68</a>
+<a href="#wxwin2">Settings for wxWidgets 2.2</a> / <a href="#wxwin1">Settings for wxWidgets 1.68</a>
 </CENTER>
 
 <P>
 
-To compile wxWindows samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWindows
+To compile wxWidgets samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWidgets
 using the makefile or project file provided), the following
 steps and settings should be used.<P>
 
@@ -38,16 +38,16 @@
 <ol>
 <li>Create a new WIN32 Application project.
 <li>Add the .cpp and .rc files for your project.
-<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWindows
+<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWidgets
 installation path.
 </ol>
 
 <P>
 
-<H2><a name="wxwin2">Settings for wxWindows 2.2</a></H2>
+<H2><a name="wxwin2">Settings for wxWidgets 2.2</a></H2>
 
-These settings apply to wxWindows 2.1.14 and above but most of them are not
-necessary any longer for wxWindows 2.3+.<P>
+These settings apply to wxWidgets 2.1.14 and above but most of them are not
+necessary any longer for wxWidgets 2.3+.<P>
 
 <DL>
 <DT><B>General</B><DD>
@@ -95,7 +95,7 @@
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib
+winmm.lib wxmsw25d.lib wxbase25d.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib
 </PRE>
 
 for the Debug configuration and
@@ -103,7 +103,7 @@
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib
+winmm.lib wxmsw25.lib wxbase25.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib
 </PRE>
 
 for the Release configuration.<P>
@@ -144,7 +144,7 @@
 
 <HR>
 
-<H2><a name="wxwin1">Settings for wxWindows 1.68</a></H2>
+<H2><a name="wxwin1">Settings for wxWidgets 1.68</a></H2>
 
 Note: these have not yet been checked.<P>
 
@@ -172,12 +172,12 @@
 <DT><B>C/C++: Precompiled Headers</B><DD>
 
 The <B>Not using precompiled headers</B> or <B>Automatic use of precompiled headers</B>
-button should be selected (I can't find a way of using the wxWindows PCH file).<P>
+button should be selected (I can't find a way of using the wxWidgets PCH file).<P>
 
 <DT><B>C/C++: Code Generation</B><DD>
 
 The <B>Use run-time library</B> control should be set to <B>Multithreaded DLL</B>. This
-sets the compiler switch to /MD to match the wxWindows makefile.<P>
+sets the compiler switch to /MD to match the wxWidgets makefile.<P>
 
 <DT><B>Link: Input</B><DD>
 

Index: internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript
diff -u internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript:2.1.5.1 internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript:2.2
--- internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M8xml2mcp.applescript	Wed Sep 22 14:21:07 2004
@@ -4,7 +4,7 @@
 -- Author:      Gilles Depeyrot
 -- Modified by: Stefan Csomor
 -- Created:     30.11.2001
--- RCS-ID:      $Id: M8xml2mcp.applescript,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+-- RCS-ID:      $Id: M8xml2mcp.applescript,v 2.2 2004/09/22 21:21:07 heikki Exp $
 -- Copyright:   (c) 2001 Gilles Depeyrot
 -- Licence:     wxWindows licence
 -----------------------------------------------------------------------------
@@ -42,13 +42,10 @@
 	
 	tell application "Finder" to update inFolder
 	
-	try
-		tell application "Finder" to set theXml to ((the first file of inFolder whose name ends with gXmlSuffix) as string)
-	on error
-		set theXml to ""
-	end try
+	tell application "Finder" to set theXmlList to (every file of inFolder whose name ends with gXmlSuffix)
 	
-	if theXml is not "" then
+	repeat with theXml in theXmlList
+		set theXml to theXml as string
 		set theXmlCount to theXmlCount + 1
 		
 		-- save the current text delimiters
@@ -78,7 +75,7 @@
 				tell me to display dialog "Error " & errnum & " importing " & theXml & " to " & theImport
 			end try
 		end tell
-	end if
+	end repeat
 	
 	tell application "Finder" to set theSubFolders to every folder of inFolder whose name does not end with " Data"
 	repeat with theFolder in theSubFolders

Index: internal/wxPython-2.5/distrib/msw/setup.var
diff -u internal/wxPython-2.5/distrib/msw/setup.var:2.1.5.1 internal/wxPython-2.5/distrib/msw/setup.var:2.2
--- internal/wxPython-2.5/distrib/msw/setup.var:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/setup.var	Wed Sep 22 14:21:02 2004
@@ -11,13 +11,13 @@
 # The application title
 #-------------------------------------------------------------------------
 
-APPTITLE="wxWindows"
+APPTITLE="wxWidgets"
 
 #-------------------------------------------------------------------------
 # The application author (copyright holder)
 #-------------------------------------------------------------------------
 
-AUTHOR="The wxWindows Team"
+AUTHOR="The wxWidgets Team"
 
 #-------------------------------------------------------------------------
 # The application vendor (organisation)
@@ -53,7 +53,7 @@
 # The temporary image directory to use when preparing the setup
 #-------------------------------------------------------------------------
 
-SETUPIMAGEDIR=$APPDIR/deliver/wxWindows-$VERSION
+SETUPIMAGEDIR=$APPDIR/deliver/wxWidgets-$VERSION
 
 #-------------------------------------------------------------------------
 # The name of the file with $VERSIONSYMBOL in it
@@ -93,7 +93,7 @@
 # The location of the setup compiler
 #-------------------------------------------------------------------------
 
-SETUPCOMPILER="c:/Program Files/Inno Setup 2/compil32.exe"
+SETUPCOMPILER="c:/Program Files/Inno Setup 4/compil32.exe"
 
 #-------------------------------------------------------------------------
 # Whether we will compress the binary (0 or 1).

Index: internal/wxPython-2.5/distrib/msw/tarwxx11
diff -u internal/wxPython-2.5/distrib/msw/tarwxx11:2.1.5.1 internal/wxPython-2.5/distrib/msw/tarwxx11:2.2
--- internal/wxPython-2.5/distrib/msw/tarwxx11:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tarwxx11	Wed Sep 22 14:21:02 2004
@@ -3,7 +3,7 @@
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 

Index: internal/wxPython-2.5/docs/tech/tn0009.htm
diff -u internal/wxPython-2.5/docs/tech/tn0009.htm:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0009.htm:2.2
--- internal/wxPython-2.5/docs/tech/tn0009.htm:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0009.htm	Wed Sep 22 14:21:14 2004
@@ -40,7 +40,7 @@
 To convert from XPM to BMP (which can be loaded or pasted into an icon editor to save as an ICO file),
 you can use Vadim Zeitlin's <a href="ftp://biolpc22.york.ac.uk/pub/support/xpm2bmp.exe">xpm2bmp.exe</a> utility.
 To convert from BMP to XPM, you can use <a href="ftp://biolpc22.york.ac.uk/pub/support/bmp2xpm.exe">bmp2xpm.exe</a>
-which is actually the old wxWindows 1.68 utility, xpmshow. You will have to edit the resulting
+which is actually the old wxWidgets 1.68 utility, xpmshow. You will have to edit the resulting
 file since the full path is used as the variable name, plus you may wish to specify a transparent colour e.g.:<P>
 
 <pre>
@@ -51,7 +51,7 @@
 
 <!--
 Author:  JS
-Version: $Id: tn0009.htm,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0009.htm,v 2.2 2004/09/22 21:21:14 heikki Exp $
 -->
 
 </font>

Index: internal/wxPython-2.5/docs/tech/tn0013.txt
diff -u internal/wxPython-2.5/docs/tech/tn0013.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0013.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0013.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0013.txt	Wed Sep 22 14:21:14 2004
@@ -16,17 +16,17 @@
 
 a) Do a fresh checkout using the command
 
-        cvs -d :pserver:anoncvs at cvs.wxwindows.org:/packs/cvsroots/wxwindows co wxGTK
+        cvs -d :pserver:anoncvs at cvs.wxwidgets.org:/packs/cvsroots/wxwidgets co wxGTK
 
    NB: if you realize later that some needed files were not checked out
        by this command, please modify CVSROOT/modules to include the missing
        files so that it works for the next release!
 
    You also need the samples, demos and contrib directories, so change to
-   wxWindows directory created by the first cvs command and do "cvs up -d"
+   wxWidgets directory created by the first cvs command and do "cvs up -d"
    for each of them.
 
-b) Create a build directory under wxWindows, e.g. I use "gtk-release",
+b) Create a build directory under wxWidgets, e.g. I use "gtk-release",
    "cd" to it and run configure: the options don't really matter, you can use
    something like
 
@@ -129,20 +129,20 @@
 -------------------------
 
 a) FreshMeat:
-   - http://freshmeat.net/projects/wxwindowsgtk/
+   - http://freshmeat.net/projects/wxwidgetsgtk/
    - username and password are "wxgtk" for logging in
    - hit "new release" at the top
    - follow the step by step
 
-b) wx-announce mailing list: mailto:wx-announce at lists.wxwindows.org
+b) wx-announce mailing list: mailto:wx-announce at lists.wxwidgets.org
 
    [where is the announcement text? TODO]
 
-c) update www.wxwindows.org
+c) update www.wxwidgets.org
 
 d) GNOME (very effective, stays on front page for days):
     - http://www.gnome.org/applist
-    - Search for wxWindows
+    - Search for wxWidgets
     - Update the version number
     - Ignore the error message
 

Index: internal/wxPython-2.5/docs/gtk/install.txt
diff -u internal/wxPython-2.5/docs/gtk/install.txt:2.1.5.1 internal/wxPython-2.5/docs/gtk/install.txt:2.2
--- internal/wxPython-2.5/docs/gtk/install.txt:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/gtk/install.txt	Wed Sep 22 14:21:06 2004
@@ -1,4 +1,4 @@
-wxWindows 2.5 for GTK installation
+wxWidgets 2.5 for GTK installation
 ----------------------------------
 
 IMPORTANT NOTE:
@@ -9,14 +9,14 @@
   mailing wxwin-users or the author. Preferably, try to fix the
   problem first and then send a patch to the author.
 
-  When sending bug reports tell us what version of wxWindows you are
+  When sending bug reports tell us what version of wxWidgets you are
   using (including the beta) and what compiler on what system. One
   example: wxGTK 2.4.0, gcc 2.95.4, Redhat 6.2
 
 * The simplest case
 -------------------
 
-If you compile wxWindows on Linux for the first time and don't like to read
+If you compile wxWidgets on Linux for the first time and don't like to read
 install instructions just do (in the base dir):
 
 > ./configure --with-gtk
@@ -34,7 +34,7 @@
 > ldconfig
 > exit
 
-If you want to remove wxWindows on Unix you can do this:
+If you want to remove wxWidgets on Unix you can do this:
 
 > su <type root password>
 > make uninstall
@@ -68,10 +68,10 @@
 * The expert case
 -----------------
 
-If you want to do some more serious cross-platform programming with wxWindows,
+If you want to do some more serious cross-platform programming with wxWidgets,
 such as for GTK and Motif, you can now build two complete libraries and use
 them concurrently. For this end, you have to create a directory for each build
-of wxWindows - you may also want to create different versions of wxWindows
+of wxWidgets - you may also want to create different versions of wxWidgets
 and test them concurrently. Most typically, this would be a version configured
 with --enable-debug and one without. Note, that only one build can
 currently be installed, so you'd have to use local version of the library for
@@ -114,7 +114,7 @@
 they were installed in a non default location.
 
 You get errors from make: please use GNU make instead of the native make
-program. Currently wxWindows can be built only with GNU make, BSD make and
+program. Currently wxWidgets can be built only with GNU make, BSD make and
 Solaris make. Other versions might work or not (any which don't have VPATH
 support definitely won't).
 
@@ -142,7 +142,7 @@
 * General
 ---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with
+The Unix variants of wxWidgets use GNU configure. If you have problems with
 your make use GNU make instead.
 
 If you have general problems with installation, read my homepage at
@@ -158,7 +158,7 @@
 * GUI libraries
 ---------------
 
-wxWindows/GTK requires the GTK+ library to be installed on your system. It has
+wxWidgets/GTK requires the GTK+ library to be installed on your system. It has
 to be a stable version, preferably version 1.2.10 (at least 1.2.3 is required,
 1.2.7 is strongly recommended).
 
@@ -172,7 +172,7 @@
 * Additional libraries
 ----------------------
 
-wxWindows/Gtk requires a thread library and X libraries known to work with
+wxWidgets/Gtk requires a thread library and X libraries known to work with
 threads.  This is the case on all commercial Unix-Variants and all
 Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
 many aspects. As of writing this, virtually all Linux distributions have
@@ -192,7 +192,7 @@
 
 Please send comments and question about the OS/2 installation
 to Stefan Neis <Stefan.Neis at t-online.de> and patches to
-the wxWindows mailing list.
+the wxWidgets mailing list.
 
 In the following list, the version numbers indicate the configuration that
 was actually used by myself, newer version should cause no problems and
@@ -260,8 +260,8 @@
 
     ./configure --help
 
-It is recommended to build wxWindows in another directory (maybe a
-subdirectory of your wxWindows installation) as this allows you to
+It is recommended to build wxWidgets in another directory (maybe a
+subdirectory of your wxWidgets installation) as this allows you to
 have multiple configurations (for example, debug and release or GTK
 and Motif) simultaneously.
 
@@ -290,9 +290,9 @@
     --disable-shared        Do not create shared libraries, but
                             build static libraries instead.
 
-    --enable-monolithic     Build wxWindows as single library instead
+    --enable-monolithic     Build wxWidgets as single library instead
                             of as several smaller libraries (which is
-                            the default since wxWindows 2.5.0).
+                            the default since wxWidgets 2.5.0).
 
     --disable-optimise      Do not optimise the code. Can
                             sometimes be useful for debugging
@@ -332,7 +332,7 @@
                             such as gdb (or its many frontends).
 
     --enable-debug_flag     Define __DEBUG__ and __WXDEBUG__ when
-                            compiling. This enable wxWindows' very
+                            compiling. This enable wxWidgets' very
                             useful internal debugging tricks (such
                             as automatically reporting illegal calls)
                             to work. Note that program and library
@@ -350,14 +350,14 @@
 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
-drastically reduced by removing features from wxWindows that
+drastically reduced by removing features from wxWidgets that
 are not used in your program. The most relevant such features
 are
 
     --with-odbc             Enables ODBC code. This is disabled
                             by default because iODBC is under the
                             L-GPL license which is less liberal than
-                            wxWindows license.
+                            wxWidgets license.
 
     --without-libpng        Disables PNG image format code.
 
@@ -432,7 +432,7 @@
 
         make install
 
-You can remove any traces of wxWindows by typing
+You can remove any traces of wxWidgets by typing
 
         make uninstall
 
@@ -468,14 +468,14 @@
 This is certain to become the standard way unless we decide
 to stick to tmake.
 
-If your application uses only some of wxWindows libraries, you can
+If your application uses only some of wxWidgets libraries, you can
 specify required libraries when running wx-config. For example,
 `wx-config --libs=html,core` will only output link command to link
 with libraries required by core GUI classes and wxHTML classes. See
 the manual for more information on the libraries.
 
 2) The other way creates a project within the source code
-directories of wxWindows. For this endeavour, you'll need
+directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.

Index: internal/wxPython-2.5/distrib/msw/innobott.txt
diff -u internal/wxPython-2.5/distrib/msw/innobott.txt:2.1.5.1 internal/wxPython-2.5/distrib/msw/innobott.txt:2.2
--- internal/wxPython-2.5/distrib/msw/innobott.txt:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/innobott.txt	Wed Sep 22 14:21:02 2004
@@ -4,11 +4,12 @@
     Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 ;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
+    Name: "{group}\Uninstall wxWidgets %VERSION%"; Filename: "{uninstallexe}"
 
 [INI]
 
@@ -30,10 +31,10 @@
 ; DO NOT DELETE THEM or you may be unable to reload the script
 
 ;[ScriptSetup]
-;VerNum=2.5.1
+;VerNum=2.5.2
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx2dev\wxWindows\deliver
-;CopyrightText=Copyright © The wxWindows Team
+;OutputFolder=C:\wx2dev\wxWidgets\deliver
+;CopyrightText=Copyright © The wxWidgets Team
 

Index: internal/wxPython-2.5/distrib/msw/tmake/tmake.conf
diff -u internal/wxPython-2.5/distrib/msw/tmake/tmake.conf:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/tmake.conf:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/tmake.conf:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/tmake.conf	Wed Sep 22 14:21:03 2004
@@ -1,5 +1,5 @@
 #
-# $Id: tmake.conf,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+# $Id: tmake.conf,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #
 # tmake configuration for linux-g++
 #

Index: internal/wxPython-2.5/distrib/msw/cw.rsp
diff -u internal/wxPython-2.5/distrib/msw/cw.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/cw.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/cw.rsp:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/cw.rsp	Wed Sep 22 14:21:02 2004
@@ -82,7 +82,6 @@
 samples/validate/*W7.xml
 samples/widgets/*W7.xml
 samples/wizard/*W7.xml
-samples/wxtest/*W7.xml
 
 utils/helpview/src/*W7.xml
 utils/tex2rtf/src/*W7.xml

Index: internal/wxPython-2.5/docs/mac/SetXMLCreator.applescript
diff -u /dev/null internal/wxPython-2.5/docs/mac/SetXMLCreator.applescript:2.1
--- /dev/null	Wed Sep 22 14:21:23 2004
+++ internal/wxPython-2.5/docs/mac/SetXMLCreator.applescript	Wed Sep 22 14:21:07 2004
@@ -0,0 +1,36 @@
+---------------------------------------------------------------------------------
+-- Name:        docs/mac/SetXMLCreator.applescript
+-- Purpose:     Sets the creator types of the XML files
+-- Author:      Ryan Wilcox
+-- Modified by:
+-- Created:     2004-03-30
+-- RCS-ID:      $Id: SetXMLCreator.applescript,v 2.1 2004/09/22 21:21:07 heikki Exp $
+-- Copyright:   (c) 2004 Ryan Wilcox
+-- Licence:     wxWindows licence
+--
+-- Press the run button and select the file you need (or, alternatively, save the
+-- script as an application drag-and-drop the files on top of it).
+---------------------------------------------------------------------------------
+
+on run
+    set myFile to choose file
+    open ({myFile})
+end run
+
+
+on open (fileList)
+    
+    repeat with each in fileList
+        
+        tell application "Finder"
+            if name of each contains "M5" or name of each contains "M7" or name of each contains "M8" then
+                set creator type of each to "CWIE"
+                set file type of each to "TEXT"
+                
+                log "set"
+            end if
+            
+        end tell
+    end repeat
+end open
+

Index: internal/wxPython-2.5/distrib/msw/tarmicrowin.sh
diff -u internal/wxPython-2.5/distrib/msw/tarmicrowin.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/tarmicrowin.sh:2.2
--- internal/wxPython-2.5/distrib/msw/tarmicrowin.sh:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tarmicrowin.sh	Wed Sep 22 14:21:02 2004
@@ -22,7 +22,7 @@
 
 WXVER=$3
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From   $1
 echo   To     $2
 echo CTRL-C if this is not correct.

Index: internal/wxPython-2.5/distrib/msw/tmake/makeall.sh
diff -u internal/wxPython-2.5/distrib/msw/tmake/makeall.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/makeall.sh:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/makeall.sh:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/makeall.sh	Wed Sep 22 14:21:03 2004
@@ -5,7 +5,7 @@
 # Author:    Michael Bedward
 # Created:   29 Aug 1999
 # Copyright: (c) 1999 Michael Bedward
-# Version:   $Id: makeall.sh,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+# Version:   $Id: makeall.sh,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #
 # This creates the makefiles for all compilers from the templates using
 # tmake. The tmake executable should be in the path.

Index: internal/wxPython-2.5/distrib/msw/innotop.txt
diff -u internal/wxPython-2.5/distrib/msw/innotop.txt:2.1.5.1 internal/wxPython-2.5/distrib/msw/innotop.txt:2.2
--- internal/wxPython-2.5/distrib/msw/innotop.txt:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/innotop.txt	Wed Sep 22 14:21:02 2004
@@ -25,9 +25,9 @@
     DisableStartupPrompt=0
     CreateAppDir=1
     DisableProgramGroupPage=0
-    AlwaysCreateUninstallIcon=1
+;    AlwaysCreateUninstallIcon=1
     Uninstallable=1
-    UninstallIconName=Uninstall %APPTITLE% %VERSION%
+;    UninstallIconName=Uninstall %APPTITLE% %VERSION%
     UninstallDisplayName=%APPTITLE% %VERSION%
     UninstallLogMode=Append
     DefaultDirName=c:\%APPTITLE%-%VERSION%
@@ -35,10 +35,10 @@
     LicenseFile=%LICENSEFILE%
     InfoBeforeFile=%READMEFILE%
     InfoAfterFile=%READMEAFTERFILE%
-    MessagesFile=compiler:default.isl
+;    MessagesFile=compiler:default.isl
     DiskSpanning=1
-    DiskSize=1457664
-    DiskClusterSize=512
+;    DiskSize=1457664
+;    DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
     SourceDir=%SOURCEDIR%

Index: internal/wxPython-2.5/distrib/msw/tmake/v15.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/v15.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/v15.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/v15.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/v15.t	Wed Sep 22 14:21:03 2004
@@ -5,7 +5,7 @@
 #!                  tmake -t v15 wxwin.pro -o Makefile
 #! Author:  Vadim Zeitlin
 #! Created: 16.12.99
-#! Version: $Id: v15.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: v15.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/wine/readme.txt
diff -u internal/wxPython-2.5/docs/wine/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/wine/readme.txt:2.2
--- internal/wxPython-2.5/docs/wine/readme.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/wine/readme.txt	Wed Sep 22 14:21:16 2004
@@ -1,8 +1,8 @@
 
-  Welcome to wxWindows/Wine 2.1 snapshot 7,
+  Welcome to wxWidgets/Wine 2.1 snapshot 7,
 
 you have downloaded version 2.1 of the WINE port of 
-the wxWindows GUI library. This is a developers release
+the wxWidgets GUI library. This is a developers release
 and is it not suited for production development. Beware
 that major changes can happen before a final release.
 
@@ -10,7 +10,7 @@
 
   http://wesley.informatik.uni-freiburg.de/~wxxt
   
-and about the wxWindows project as a whole (and the
+and about the wxWidgets project as a whole (and the
 Windows and Motif ports in particular) can be found
 at Julian Smart's homepage at:
 
@@ -29,14 +29,14 @@
 
 The library produced by the install process will be called 
 libwx_mse.a (static) and libwx_msw-2.1.so.0.0.0 (shared) so that 
-once a binary incompatible version of wxWindows/Gtk comes out 
+once a binary incompatible version of wxWidgets/Gtk comes out 
 we'll augment the library version number to avoid linking problems.
 
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
+bug reports or comments to the wxWidgets users list. Information 
 on how to subscribe is available from my homepage.
 
-wxWindows/Wine doesn't come with any guarantee whatsoever. It might 
+wxWidgets/Wine doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be
 suitable for any special or general purpose.
 

Index: internal/wxPython-2.5/docs/x11/readme-nanox.txt
diff -u internal/wxPython-2.5/docs/x11/readme-nanox.txt:2.1.5.1 internal/wxPython-2.5/docs/x11/readme-nanox.txt:2.2
--- internal/wxPython-2.5/docs/x11/readme-nanox.txt:2.1.5.1	Thu Apr  8 18:15:21 2004
+++ internal/wxPython-2.5/docs/x11/readme-nanox.txt	Wed Sep 22 14:21:17 2004
@@ -14,12 +14,12 @@
 	http://microwindows.org/
 
 Nano-X is intended to work on devices with very small amounts
-of memory. wxWindows is quite a large library, so if your
+of memory. wxWidgets is quite a large library, so if your
 memory is measured in KB instead of MB you will need to use
 an alternative library, such as FLTK. However, with memory
-capacity increasing all the time, wxWindows could become
+capacity increasing all the time, wxWidgets could become
 an appropriate embedded GUI solution for many projects.
-Also, it's possible to think of ways to cut wxWindows
+Also, it's possible to think of ways to cut wxWidgets
 further down to size, such as disabling advanced controls
 or rewriting utility functions. See the section on code size
 below.
@@ -43,7 +43,7 @@
 may find it convenient to put it in your .bash_profile or similar
 file.
 
-Typically, various features in wxWindows will be switched off to
+Typically, various features in wxWidgets will be switched off to
 conserve space. The sample script below calls configure with typical
 options for Nano-X.
 
@@ -64,7 +64,7 @@
 ==========
 
 Nano-X has a different API from Xlib, although there
-are many similarities. Instead of changing the wxWindows
+are many similarities. Instead of changing the wxWidgets
 code to reflect Nano-X conventions, a compatibility
 layer has been added, in the form of these files:
 
@@ -105,14 +105,14 @@
 Code Size
 =========
 
-Allow about 2.5 MB for a shared wxWindows library, with the
+Allow about 2.5 MB for a shared wxWidgets library, with the
 dynamically linked minimal sample taking about 24KB. If statically
 linked, minimal takes up just over 1MB when stripped. This 1MB
-includes all of wxWindows used in the minimal sample including some of
+includes all of wxWidgets used in the minimal sample including some of
 the wxUniversal widgets. As application complexity increases,
-the amount of wxWindows code pulled into statically linked
+the amount of wxWidgets code pulled into statically linked
 executables increases, but for large applications, the overhead
-of wxWindows becomes less significant.
+of wxWidgets becomes less significant.
 
 Sample sizes:
 -------------
@@ -142,8 +142,8 @@
 - Rewrite functions or classes for alternative stripped-down
   functionality.
 - Remove unnecessary functionality or obsolete code from
-  wxWindows.
-- Factor out wxWindows code to reduce repetition.
+  wxWidgets.
+- Factor out wxWidgets code to reduce repetition.
 - Add inlining, remove unnecessary empty functions.
 - Separate code out into individual files so that all of
   a .o file doesn't get pulled in, just because an app
@@ -162,7 +162,7 @@
 ===================================
 
 This script assumes that you will invoke it
-from a build directory under the wxWindows
+from a build directory under the wxWidgets
 top level. So you might type:
 
 % cd wx2

Index: internal/wxPython-2.5/docs/tech/tn0004.htm
diff -u internal/wxPython-2.5/docs/tech/tn0004.htm:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0004.htm:2.2
--- internal/wxPython-2.5/docs/tech/tn0004.htm:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0004.htm	Wed Sep 22 14:21:14 2004
@@ -10,9 +10,9 @@
 </head>
 <body>
 <h2>
-Compiling wxWindows samples with the Borland CBuilder</h2>
-Please use wxWindows 2.4.x this will not work with the new makefiles in
-wxWindows 2.5.0<br>
+Compiling wxWidgets samples with the Borland CBuilder</h2>
+Please use wxWidgets 2.4.x this will not work with the new makefiles in
+wxWidgets 2.5.0<br>
 <br>
 <br>
 </body>

Index: internal/wxPython-2.5/distrib/msw/tmake/mac.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/mac.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/mac.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/mac.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/mac.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMac library is generated by tmake
 #! Author:  Gilles Depeyrot
 #! Created: 04.10.01
-#! Version: $Id: mac.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: mac.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/msw/wince/readme.txt
diff -u internal/wxPython-2.5/docs/msw/wince/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/wince/readme.txt:2.2
--- internal/wxPython-2.5/docs/msw/wince/readme.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/wince/readme.txt	Wed Sep 22 14:21:12 2004
@@ -1,16 +1,16 @@
 
   =================================================
-  Welcome to wxWindows/CE 2.5.1
+  Welcome to wxWidgets/CE 2.5.2
   =================================================
 
-You have downloaded version 2.5.1 of the Windows CE port of
-the wxWindows GUI library. This runs on PocketPC 2002,
+You have downloaded version 2.5.2 of the Windows CE port of
+the wxWidgets GUI library. This runs on PocketPC 2002,
 SmartPhone 2002, and Windows CE .NET 4.x.
 
-More information about the wxWindows project as a whole
+More information about the wxWidgets project as a whole
 can be found at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
 
 Information about the Windows CE port in particular
 can be found here:
@@ -22,7 +22,7 @@
 
 These are the supported platforms at the moment:
 
-- x86 emulator
+- x86 emulator build in eVC 3 and eVC 4.x
 - PocketPC (StrongARM)
 
 You can test the library and applications using PocketPC emulator 
@@ -43,9 +43,9 @@
 
 You can install other targets but you will need
 to create new configurations for them in the
-wxWindows project files.
+wxWidgets project files.
 
-wxWindows/CE Configuration
+wxWidgets/CE Configuration
 ================================
 
 You may wish to customize the following file
@@ -53,34 +53,18 @@
 
 include/wx/msw/wince/setup.h
 
-These are some of the Windows CE-specific settings
-you can adjust.
-
-wxUSE_POCKETPC_UI
-
-  If you are compiling with Windows CE .NET, you may
-  wish to emulate PocketPC behaviour (set it to 1), or
-  take advantage of the greater flexibility of
-  Windows CE .NET (set it to 0).
-  If 0, the PocketPC-specific toolbar class will be
-  used, which uses commandbar to combine the toolbar
-  and menubar in one control. If 1, the normal menubar
-  and toolbar behaviour will be used, as per
-  desktop Windows.
-
-wxUSE_SMARTPHONE
-
-  Set this to 1 if you wish to compile for the SmartPhone
-  platform (with eVC++ 3).
-
-wxWindows/CE Compilation
+wxWidgets/CE Compilation
 ================================
 
-Open src/msw/wince/wxWindowsCE.vcp, select an
+NOTE: in lack of workspace and project files for eVC IDE 
+in source tree of wxWidgets you should build them yourself using Bakefile.
+See technote docs/tech/tn0016.txt for details.
+
+Open build/wince/wxWidgetsCE.vcw, select an
 ARM or x86 target (or emulator target for eVC++ 4),
 and compile.
 
-Then open samples/minimal/minimalCE.vcp, select an
+Then open samples/minimal/minimal.vcw, select an
 ARM, x86 or emulator target, and compile. You can
 use the emulator or real hardware to run the
 sample.
@@ -90,21 +74,21 @@
 
 To compile using the emulator on eVC++3:
 
-- Open src/msw/wince/wxWindowsCE.vcp, select the
+- Open build/wince/wxWidgetsCE.vcw, select the
   WIN32 (WCE x86) Debug Unicode configuration, close the dialog,
   then select Pocket PC 2002 and Pocket PC 2002 Emulation on the toolbar,
   and compile.
 
-- Open samples/minimal/minimalCE.vcp, select the
+- Open samples/minimal/minimal.vcw, select the
   WIN32 (WCE x86 Debug) configuration, select Pocket PC 2002 and
   Pocket PC 2002 Emulation as before, and compile.
 
 To compile using the emulator on eVC++4:
 
-- Open src/msw/wince/wxWindowsCE.vcp, select the
+- Open build/wince/wxWidgetsCE.vcw, select the
   WIN32 (WCE Emulator) Debug Unicode configuration, and compile.
 
-- Open samples/minimal/minimalCE.vcp with eCV 4.0, select the
+- Open samples/minimal/minimal.vcw with eCV 4.0, select the
   WIN32 (WCE emulator) Debug configuration, and compile.
 
 Status

Index: internal/wxPython-2.5/distrib/msw/maketarballs
diff -u internal/wxPython-2.5/distrib/msw/maketarballs:2.1.5.1 internal/wxPython-2.5/distrib/msw/maketarballs:2.2
--- internal/wxPython-2.5/distrib/msw/maketarballs:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/maketarballs	Wed Sep 22 14:21:02 2004
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Makes the wxWindows tarballs with 'make dist'
+# Makes the wxWidgets tarballs with 'make dist'
 
 doupdatecvs()
 {
@@ -224,7 +224,7 @@
     esac
 done
 
-echo About to make wxWindows RPMs:
+echo About to make wxWidgets RPMs:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER

Index: internal/wxPython-2.5/docs/mgl/readme.txt
diff -u internal/wxPython-2.5/docs/mgl/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/mgl/readme.txt:2.2
--- internal/wxPython-2.5/docs/mgl/readme.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/mgl/readme.txt	Wed Sep 22 14:21:09 2004
@@ -1,15 +1,15 @@
 
-  Welcome to wxWindows/MGL 2.3
+  Welcome to wxWidgets/MGL 2.3
 
 You have downloaded version 2.3 of the MGL port of
-the wxWindows GUI library. This runs on top of SciTech MGL library
+the wxWidgets GUI library. This runs on top of SciTech MGL library
 (http://www.scitechsoft.com) that is available for variety of 
 operating systems and comes with support for embedded devices.
 
-More information about the wxWindows project as a whole
+More information about the wxWidgets project as a whole
 can be found at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
   
 Information on how to install can be found in the file 
 install.txt
@@ -17,5 +17,5 @@
 
   Regards,
 
-  The wxWindows team
+  The wxWidgets team
 

Index: internal/wxPython-2.5/docs/mac/M5replace.sh
diff -u internal/wxPython-2.5/docs/mac/M5replace.sh:2.1.5.1 internal/wxPython-2.5/docs/mac/M5replace.sh:2.2
--- internal/wxPython-2.5/docs/mac/M5replace.sh:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M5replace.sh	Wed Sep 22 14:21:07 2004
@@ -5,7 +5,7 @@
 #-- Author:      Gilles Depeyrot
 #-- Modified by:
 #-- Created:     08.01.2002
-#-- RCS-ID:      $Id: M5replace.sh,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+#-- RCS-ID:      $Id: M5replace.sh,v 2.2 2004/09/22 21:21:07 heikki Exp $
 #-- Copyright:   (c) 2001 Gilles Depeyrot
 #-- Licence:     wxWindows licence
 #-----------------------------------------------------------------------------

Index: internal/wxPython-2.5/docs/publicity/slogans.txt
diff -u internal/wxPython-2.5/docs/publicity/slogans.txt:2.1.5.1 internal/wxPython-2.5/docs/publicity/slogans.txt:2.2
--- internal/wxPython-2.5/docs/publicity/slogans.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/publicity/slogans.txt	Wed Sep 22 14:21:13 2004
@@ -1,4 +1,4 @@
-wxWindows slogan ideas
+wxWidgets slogan ideas
 
 CafePress products:
 
@@ -13,7 +13,7 @@
 
 (perhaps highlighted in different colours)
 
-wxWindows: "Practically Perfect in Every Way"
+wxWidgets: "Practically Perfect in Every Way"
 
 -----------
 
@@ -28,7 +28,7 @@
 Build an app for Windows, Mac and Linux in a week?
 No sweat.
 
-<wxWindows logo>
+<wxWidgets logo>
 wxwindows.org
 
 -----------
@@ -41,7 +41,7 @@
 
 On hat:
 
-wxWindows
+wxWidgets
 Brim-full of cool GUI tools
 
 -----------
@@ -54,7 +54,7 @@
 
 Suggested slogans from wx-users:
 
-wxWindows: The API for programmers who aren't sheep.
+wxWidgets: The API for programmers who aren't sheep.
 (Robin Dunn)
 
 Better printed on a shirt:
@@ -81,7 +81,7 @@
 
 .. and templates.
 
-Hmm. I might buy a mug that had, say, a wxLogo and "wxWindows" (and 
+Hmm. I might buy a mug that had, say, a wxLogo and "wxWidgets" (and 
 maybe the website URL underneath in smaller type) on one side and 
 "Specialization is for insects ... and templates" on the other.
 
@@ -113,7 +113,7 @@
 
 ============================
 
-wxWindows: Write it once and for all.
+wxWidgets: Write it once and for all.
 
 Matt Gregory <msgregory at earthlink.net>
 
@@ -123,7 +123,7 @@
 At front:
 
     Need an API?
-      <wxWindows>
+      <wxWidgets>
    and get THE API
 
        C++, Python, Basic, Lua ...
@@ -131,7 +131,7 @@
 At back
 
     <windows> OR <linux> OR <mac> ?
-                <wxWindows>  is
+                <wxWidgets>  is
     <windows> AND <linux> AND <mac>
 
 where <xxxxx> is the respective logo
@@ -147,10 +147,10 @@
 One API to rule them all, one API to hide them
 One API to bridge them all and in the compiler bind them.
 
-wxWindows
+wxWidgets
 
 How about "and in the linker bind them"? That's where the local libraries 
-get bound to the wxWindows code anyway.
+get bound to the wxWidgets code anyway.
 
 ============================
 

Index: internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/vc6msw.t	Wed Sep 22 14:21:03 2004
@@ -6,7 +6,7 @@
 #!                  tmake -t vc6msw wxwin.pro -o wxWindows.dsp
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
-#! Version: $Id: vc6msw.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: vc6msw.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     use lib './lib';

Index: internal/wxPython-2.5/distrib/msw/zipmac.sh
diff -u internal/wxPython-2.5/distrib/msw/zipmac.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/zipmac.sh:2.2
--- internal/wxPython-2.5/distrib/msw/zipmac.sh:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/zipmac.sh	Wed Sep 22 14:21:02 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Zip up an external, generic + Windows distribution of wxWindows 2
+# Zip up an external, generic + Windows distribution of wxWidgets 2
 # Usage: zipmac.sh dest-dir
 # (set the WXWIN variable first so it knows where to take the sources from)
 
@@ -64,6 +64,9 @@
 expandlines $SRC/distrib/msw/mac.rsp temp.txt
 zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
 
+expandlines $SRC/distrib/msw/cocoa.rsp temp.txt
+zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
+
 expandlines $SRC/distrib/msw/cw.rsp temp.txt
 zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
 
@@ -83,9 +86,9 @@
 zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
-zip -@ `$CYGPATHPROGW $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
+zip -@ `$CYGPATHPROGW $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
 
 rm -f temp.txt
 
-echo wxWindows archived.
+echo wxWidgets archived.
 

Index: internal/wxPython-2.5/distrib/msw/generic.rsp
diff -u internal/wxPython-2.5/distrib/msw/generic.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/generic.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/generic.rsp:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/generic.rsp	Wed Sep 22 14:21:02 2004
@@ -17,12 +17,12 @@
 build/bakefiles/*.bkl
 build/bakefiles/Bakefiles.bkgen
 build/bakefiles/README
-build/bakefiles/*.py
+build/bakefiles/*.py*
 build/bakefiles/*.mk
-build/bakefiles/compat/FORMATS.bkmanifest
-build/bakefiles/compat/README
-build/bakefiles/compat/wx24dsp.bkl
-build/bakefiles/compat/wx24dsp.empy
+build/bakefiles/formats/*.bkl
+build/bakefiles/formats/*.empy
+build/bakefiles/formats/README
+build/bakefiles/formats/*.bkmanifest
 
 distrib/msw/*.rsp
 distrib/msw/*.bat
@@ -135,6 +135,19 @@
 src/regex/regex.3
 src/regex/regex.7
 
+src/iodbc/AUTHORS
+src/iodbc/COPYING
+src/iodbc/autoconfig
+src/iodbc/Changes.log
+src/iodbc/IAFA-PACKAGE
+src/iodbc/INSTALL
+src/iodbc/NEWS
+src/iodbc/README
+src/iodbc/*.c
+src/iodbc/*.h
+src/iodbc/*.ci
+src/iodbc/*.exp
+
 include/wx/*.h
 include/wx/*.inl
 include/wx/*.cpp
@@ -155,6 +168,7 @@
 misc/afm/*.afm
 misc/gs_afm/*.afm
 
+utils/*.bkl
 utils/make*.*
 utils/configure
 utils/configure.in
@@ -164,6 +178,7 @@
 utils/hhp2cached/*.def
 utils/hhp2cached/*.rc
 utils/hhp2cached/makefile*
+utils/hhp2cached/*.bkl
 utils/hhp2cached/*.xbm
 utils/hhp2cached/*.xpm
 utils/hhp2cached/*.txt
@@ -171,11 +186,10 @@
 contrib/lib/dummy
 
 samples/samples.bkl
-
 samples/*.txt
 samples/makefile*
-samples/configure
-samples/configure.in
+samples/sample.r
+samples/*.xpm
 
 samples/access/*.cpp
 samples/access/*.h
@@ -381,6 +395,7 @@
 samples/docview/*.bmp
 samples/docview/*.pro
 samples/docview/*.bkl
+samples/docview/*.r
 
 samples/docvwmdi/*.h
 samples/docvwmdi/*.cpp
@@ -455,6 +470,17 @@
 samples/except/*.xpm
 samples/except/*.bkl
 
+samples/except/*.cpp
+samples/except/*.h
+samples/except/makefile*
+samples/except/*.rc
+samples/except/*.def
+samples/except/*.ico
+samples/except/*.xpm
+samples/except/*.txt
+samples/except/*.pro
+samples/except/*.bkl
+
 samples/exec/*.cpp
 samples/exec/*.h
 samples/exec/makefile*
@@ -665,6 +691,7 @@
 samples/html/helpview/*.pro
 samples/html/helpview/test.zip
 samples/html/helpview/*.bkl
+samples/html/helpview/*.r
 
 samples/image/*.cpp
 samples/image/*.h
@@ -700,12 +727,20 @@
 samples/internat/*.bmp
 samples/internat/*.mo
 samples/internat/*.pro
+samples/internat/bg/*.mo
+samples/internat/bg/*.po
+samples/internat/cs/*.mo
+samples/internat/cs/*.po
 samples/internat/fr/*.mo
 samples/internat/fr/*.po
 samples/internat/de/*.mo
 samples/internat/de/*.po
 samples/internat/ru/*.mo
 samples/internat/ru/*.po
+samples/internat/ja/*.mo
+samples/internat/ja/*.po
+samples/internat/ka/*.mo
+samples/internat/ka/*.po
 samples/internat/*.bkl
 
 samples/ipc/*.cpp
@@ -848,6 +883,7 @@
 samples/minimal/*.rc
 samples/minimal/*.pro
 samples/minimal/*.bkl
+samples/minimal/*.r
 
 samples/minifram/*.h
 samples/minifram/*.cpp
@@ -1068,6 +1104,20 @@
 samples/shaped/*.pro
 samples/shaped/*.bkl
 
+samples/splash/*.h
+samples/splash/*.cpp
+samples/splash/*.def
+samples/splash/*.rc
+samples/splash/makefile*
+samples/splash/*.xbm
+samples/splash/*.xpm
+samples/splash/*.txt
+samples/splash/*.ico
+samples/splash/*.bmp
+samples/splash/*.png
+samples/splash/*.pro
+samples/splash/*.bkl
+
 samples/splitter/*.cpp
 samples/splitter/*.h
 samples/splitter/*.def
@@ -1128,6 +1178,15 @@
 samples/statbar/*.pro
 samples/statbar/*.bkl
 
+samples/taskbar/*.cpp
+samples/taskbar/*.h
+samples/taskbar/makefile.*
+samples/taskbar/*.rc
+samples/taskbar/*.def
+samples/taskbar/*.bmp
+samples/taskbar/*.ico
+samples/taskbar/*.txt
+
 samples/text/*.cpp
 samples/text/*.h
 samples/text/makefile*
@@ -1248,24 +1307,8 @@
 samples/wizard/*.pro
 samples/wizard/*.bkl
 
-samples/wxtest/*.cpp
-samples/wxtest/*.h
-samples/wxtest/makefile*
-samples/wxtest/*.rc
-samples/wxtest/*.def
-samples/wxtest/*.bmp
-samples/wxtest/*.xpm
-samples/wxtest/*.xbm
-samples/wxtest/*.png
-samples/wxtest/*.ico
-samples/wxtest/*.txt
-samples/wxtest/*.pro
-samples/wxtest/*.bkl
-
 demos/demos.bkl
 demos/makefile*
-demos/configure
-demos/configure.in
 
 demos/bombs/*.cpp
 demos/bombs/*.h
@@ -1293,6 +1336,7 @@
 demos/forty/*.txt
 demos/forty/*.pro
 demos/forty/*.bkl
+demos/forty/*.r
 
 demos/fractal/*.cpp
 demos/fractal/*.h
@@ -1370,10 +1414,26 @@
 demos/dbbrowse/help.std/*.hhk
 demos/dbbrowse/*.bkl
 
-tests/mbconv/*.cpp
-tests/mbconv/*.bkl
+tests/*.bkl
+tests/makefile*.*
+tests/test.dsp
+tests/test.dsw
+tests/*.cpp
+tests/*.fc
 
-tests/formatconverter/*.pl
+tests/arrays/*.cpp
+tests/filesys/*.cpp
 tests/formatconverter/*.cpp
-tests/formatconverter/*.txt
+tests/longlong/*.cpp
+tests/mbconv/*.cpp
+
+tests/regex/*.cpp
+tests/regex/*.inc
+tests/regex/*.pl
+tests/regex/*.test
+
+tests/streams/*.cpp
+tests/streams/*.h
+
+tests/strings/*.cpp
 

Index: internal/wxPython-2.5/docs/tech/tn0014.txt
diff -u internal/wxPython-2.5/docs/tech/tn0014.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0014.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0014.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0014.txt	Wed Sep 22 14:21:14 2004
@@ -39,7 +39,7 @@
 <resource> nor either of <object>s is:
 
     <?xml version="1.0" encoding="utf-8">
-    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+    <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
         <object class="wxPanel">
             <style>wxSUNKEN_BORDER</style>             <!-- attr -->
             <object class="wxStaticText">
@@ -60,7 +60,7 @@
 =========================
 
 XRC resource file is a well-formed XML 1.0 document. All elements of XRC file
-are from the http://www.wxwindows.org/wxxrc namespace. 
+are from the http://www.wxwidgets.org/wxxrc namespace. 
 
 The root node of XRC document must be <resource>. The <resource> node has 
 optional "version" property. Default version  (in absence of the version 
@@ -68,9 +68,9 @@
 periods. Version of XRC format changes only if there was an incompatible 
 change introduced (i.e. either the library cannot understand old resource 
 files or older versions of the library wouldn't understand the new format).
-The first three integers are major, minor and release number of the wxWindows 
+The first three integers are major, minor and release number of the wxWidgets 
 release when the change was introduced, the last one is revision number and 
-is 0 for the first incompatible change in given wxWindows release, 1 for 
+is 0 for the first incompatible change in given wxWidgets release, 1 for 
 the second etc.
 
 Differences between versions are described within this document in paragraphs
@@ -78,14 +78,14 @@
 
 The <resource> node contains namespace declaration, too:
 
-    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+    <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 The <resource> node is only allowed to have <object> and <object_ref>
 subnodes, all of which must have the "name" property.
 
 The <object> node represents a single object (GUI element) and it usually maps
-directly to a wxWindows class instance. It three properties: "name", "class"
-and "subclass". "class" must always be present, it tells XRC what wxWindows
+directly to a wxWidgets class instance. It three properties: "name", "class"
+and "subclass". "class" must always be present, it tells XRC what wxWidgets
 object should be created in this place. The other two are optional.  "name" is
 ID used to identify the object. It is the value passed to the XRCID() macro and
 is also used to construct wxWindow's id and name attributes and must be unique
@@ -95,7 +95,7 @@
 optional name of class whose constructor will be called instead of the
 constructor for "class". Subclass must be available in the program that loads
 the resource, must be derived from "class" and must be registered within
-wxWindows' RTTI system.
+wxWidgets' RTTI system.
 
 Example:
 
@@ -150,7 +150,7 @@
 ------
 Any text. Some characters have special interpretation and are translated
 by XRC parser according to this table:
-    "_"    -> "&"  ('&' is used to underline e.g. menu items in wxWindows)
+    "_"    -> "&"  ('&' is used to underline e.g. menu items in wxWidgets)
     "__"   -> "_"
     "\n"   -> line break (C character '\n')
     "\r"   -> carriage return (C character '\r')
@@ -196,8 +196,8 @@
 written in same way as in C++ code (e.g. "wxSUNKEN_BORDER",
 "wxHW_SCROLLBAR_NEVER") and are delimined with any combination of whitespaces
 and '|'. Possible flags are class-dependent and are not described in this
-technote. Please refer to wxWindows manual for all styles that given class can
-accept; if XRC does not accept a flag listed in wxWindows documentation, it is
+technote. Please refer to wxWidgets manual for all styles that given class can
+accept; if XRC does not accept a flag listed in wxWidgets documentation, it is
 a bug.
 
 
@@ -340,7 +340,7 @@
 separation                 Integer                 -1
 
 wxToolBar node may have children <object> and <object_ref> nodes. Their class
-may be either "tool", "separator" or any wxWindows class derived from
+may be either "tool", "separator" or any wxWidgets class derived from
 wxControl. "tool" and "separator" are special pseudo-classes that may only
 appear within wxToolBar node. Their attributes are as follows:
 
@@ -382,4 +382,4 @@
 
 === EOF ===
 
-Version: $Id: tn0014.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0014.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/distrib/msw/zipxml.bat
diff -u internal/wxPython-2.5/distrib/msw/zipxml.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/zipxml.bat:2.2
--- internal/wxPython-2.5/distrib/msw/zipxml.bat:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/zipxml.bat	Wed Sep 22 14:21:02 2004
@@ -23,7 +23,7 @@
 :usage
 echo DOS wxXML distribution.
 echo Usage: zipxml source destination
-echo e.g. zipxml d:\wx2\wxWindows d:\wx2\wxWindows\deliver
+echo e.g. zipxml d:\wx2\wxWidgets d:\wx2\wxWidgets\deliver
 
 :end
 

Index: internal/wxPython-2.5/docs/mac/M5converteol.sh
diff -u internal/wxPython-2.5/docs/mac/M5converteol.sh:2.1.5.1 internal/wxPython-2.5/docs/mac/M5converteol.sh:2.2
--- internal/wxPython-2.5/docs/mac/M5converteol.sh:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/mac/M5converteol.sh	Wed Sep 22 14:21:07 2004
@@ -5,7 +5,7 @@
 #-- Author:      Gilles Depeyrot
 #-- Modified by:
 #-- Created:     07.01.2002
-#-- RCS-ID:      $Id: M5converteol.sh,v 2.1.5.1 2004/04/09 01:15:18 markie Exp $
+#-- RCS-ID:      $Id: M5converteol.sh,v 2.2 2004/09/22 21:21:07 heikki Exp $
 #-- Copyright:   (c) 2001 Gilles Depeyrot
 #-- Licence:     wxWindows licence
 #-----------------------------------------------------------------------------

Index: internal/wxPython-2.5/distrib/msw/tmake/mgl.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/mgl.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/mgl.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/mgl.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/mgl.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMGL library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 28.01.00
-#! Version: $Id: mgl.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: mgl.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/msw/issues.txt
diff -u internal/wxPython-2.5/docs/msw/issues.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/issues.txt:2.2
--- internal/wxPython-2.5/docs/msw/issues.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/issues.txt	Wed Sep 22 14:21:11 2004
@@ -18,7 +18,7 @@
 
 The solution is probably to load wxResourceBitListTable
 dynamically using LoadString to load the names, and initialize the table
-at wxWindows start-up.
+at wxWidgets start-up.
 
 Meanwhile the work-around is to switch wxUSE_WX_RESOURCES to 0
 (done in setup.h if BC++/16-bit mode is detected).

Index: internal/wxPython-2.5/docs/tech/tn0008.htm
diff -u internal/wxPython-2.5/docs/tech/tn0008.htm:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0008.htm:2.2
--- internal/wxPython-2.5/docs/tech/tn0008.htm:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0008.htm	Wed Sep 22 14:21:14 2004
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>How to learn wxWindows programming</TITLE>
+<TITLE>How to learn wxWidgets programming</TITLE>
 </HEAD>
 
 <BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#FF0000 VLINK=#000000>
@@ -14,7 +14,7 @@
 <tr>
 <td bgcolor="#660000" align=left colspan=2>
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-How to learn wxWindows programming
+How to learn wxWidgets programming
 </font>
 </td>
 </tr>
@@ -23,21 +23,21 @@
 <P>
 
 The following is a response by Edward Ream to a common question,
-"What's the best way to learn wxWindows [and C++]?".<P>
+"What's the best way to learn wxWidgets [and C++]?".<P>
 
 Date: Sun, 04 Jun 2000 14:37:06 -0500<BR>
 From: "Edward K. Ream" <edream at tds.net> <BR>
-To: wx-users at wxwindows.org<BR>
+To: wx-users at wxwidgets.org<BR>
 Subject: Re: [wx-users] How to learn using wx-windows <BR>
-Reply-To: wx-users at wxwindows.org<P>
+Reply-To: wx-users at wxwidgets.org<P>
 
 &gt; Reading the Linux Journal article on wxpython, and having used wxclips<BR>
-&gt; I got interested in wxwindows as a development interface. However, the<BR>
+&gt; I got interested in wxwidgets as a development interface. However, the<BR>
 &gt; programming experience I got is old, and from a former generation (For-<BR>
 &gt; tran). I'd like to refresh my experience and start in C++.  Will<BR>
 &gt; wx-windows be a very high step to take?<P>
 
-I'm new to wxWindows myself, but I'd like to answer this question
+I'm new to wxWidgets myself, but I'd like to answer this question
 anyway. In the past two years I've learned two similar frameworks
 (Apple's Yellow Box, aka NextStep/OpenStep and Borland's C++
 Builder/Delphi) and last year I became a C++ enthusiast after 20 years
@@ -47,7 +47,7 @@
 
 The major Aha for me was that the complexity of C++ doesn't matter in
 practice.  What _does_ matter is that C++ allows you to do simple things
-simply, more simply than C.  With a system like wxWindows you will be
+simply, more simply than C.  With a system like wxWidgets you will be
 creating objects and then using those objects to call methods.  So don't
 be afraid of C++: you'll only be using the easy tip of the
 iceberg.<P>
@@ -61,7 +61,7 @@
 
 <B>About applications frameworks.</B><P>
 
-Application frameworks such as wxWindows are organized around a set of
+Application frameworks such as wxWidgets are organized around a set of
 cooperating classes.  Take a look at the main application class, wxApp,
 some frame and panel classes, graphics classes, menu classes, control
 classes, etc.  In general, to do anything in a framework involves
@@ -117,7 +117,7 @@
 
 Learn as much as you can about the String class; after using a good
 String class you'll never want to use C's string functions again. 
-wxWindows contains other nifty utility classes as well.<P>
+wxWidgets contains other nifty utility classes as well.<P>
 
 The application class, wxApp, contains the main event loop.  Learn about
 event handling and event tables (reading sample code will help). Almost
@@ -127,8 +127,8 @@
 benefit.<P>
 
 I hope this helps. Perhaps we can work together in learning about
-wxWindows.  Please feel free to ask me any questions you might have.  If
-I've made any blunders in this posting I hope the wxWindows experts will
+wxWidgets.  Please feel free to ask me any questions you might have.  If
+I've made any blunders in this posting I hope the wxWidgets experts will
 correct me gently.<P>
 
 Edward<BR>

Index: internal/wxPython-2.5/distrib/msw/utils.rsp
diff -u internal/wxPython-2.5/distrib/msw/utils.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/utils.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/utils.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/utils.rsp	Wed Sep 22 14:21:02 2004
@@ -1,50 +1,9 @@
-utils/wxgraph/src/*.cpp
-utils/wxgraph/src/*.c
-utils/wxgraph/src/*.h
-utils/wxgraph/src/makefile*
-utils/wxgraph/src/*.xbm
-utils/wxgraph/src/*.xpm
-utils/wxgraph/lib/dummy
-utils/wxgraph/src/*.ico
-utils/wxgraph/src/*.def
-utils/wxgraph/src/*.rc
-
-utils/rcparser/src/*.cpp
-utils/rcparser/src/*.c
-utils/rcparser/src/*.h
-utils/rcparser/src/makefile*
-utils/rcparser/src/*.xbm
-utils/rcparser/src/*.xpm
-utils/rcparser/lib/dummy
-utils/rcparser/src/*.ico
-utils/rcparser/src/*.def
-utils/rcparser/src/*.rc
-utils/rcparser/src/*.rh
-
-utils/serialize/*.h
-utils/serialize/*.cpp
-utils/serialize/*.def
-utils/serialize/*.rc
-utils/serialize/makefile*
-utils/serialize/*.xbm
-utils/serialize/*.xpm
-utils/serialize/*.txt
-
-utils/makegen/*.h
-utils/makegen/*.cpp
-utils/makegen/*.def
-utils/makegen/*.rc
-utils/makegen/makefile*
-utils/makegen/*.xbm
-utils/makegen/*.xpm
-utils/makegen/*.txt
-utils/makegen/templates/make*
-
 utils/HelpGen/src/*.h
 utils/HelpGen/src/*.cpp
 utils/HelpGen/src/*.def
 utils/HelpGen/src/*.rc
 utils/HelpGen/src/makefile*
+utils/HelpGen/src/*.bkl
 utils/HelpGen/src/*.xbm
 utils/HelpGen/src/*.xpm
 utils/HelpGen/src/*.txt
@@ -60,6 +19,7 @@
 utils/emulator/src/makefile.unx
 utils/emulator/src/makefile.vms
 utils/emulator/src/makefile.g95
+utils/emulator/src/*.bkl
 utils/emulator/src/*.xbm
 utils/emulator/src/*.xpm
 utils/emulator/src/*.sty
@@ -85,6 +45,7 @@
 utils/helpview/src/*.htb
 utils/helpview/src/*.ico
 utils/helpview/src/*.xml
+utils/helpview/src/*.bkl
 utils/helpview/src/test.zip
 utils/helpview/src/bitmaps/*.xpm
 

Index: internal/wxPython-2.5/docs/index.htm
diff -u internal/wxPython-2.5/docs/index.htm:2.1.5.1 internal/wxPython-2.5/docs/index.htm:2.2
--- internal/wxPython-2.5/docs/index.htm:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/index.htm	Wed Sep 22 14:21:04 2004
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>Welcome to wxWindows 2</TITLE>
+<TITLE>Welcome to wxWidgets</TITLE>
 
 </HEAD>
 
@@ -15,7 +15,7 @@
 <tr>
 <td bgcolor="#660000">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
-Welcome to wxWindows 2
+Welcome to wxWidgets
 </font>
 </td>
 </tr>
@@ -23,7 +23,7 @@
 
 <P>
 
-Welcome to wxWindows 2, the premiere cross-platform GUI C++ framework.<P>
+Welcome to wxWidgets, the premiere cross-platform GUI C++ framework.<P>
 
 Please click on <a href="html/index.htm">docs/html/index.htm</a> to view the main document index.<P>
 

Index: internal/wxPython-2.5/docs/tech/tn0012.txt
diff -u internal/wxPython-2.5/docs/tech/tn0012.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0012.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0012.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0012.txt	Wed Sep 22 14:21:14 2004
@@ -1,14 +1,14 @@
-                      wxWindows naming conventions
+                      wxWidgets naming conventions
                       ============================
 
 Being a cross platform development library, it is naturally desirable
-(at least to me ;) for wxWindows to be exploited in a fully cross
+(at least to me ;) for wxWidgets to be exploited in a fully cross
 platform development environment -- a single invocation of make should
 be sufficient to build target executables for a variety of host platforms
 when desired.
 
 Since this is now in fact possible for at least the most commonly used
-platforms, wxWindows has been structured to allow multiple, simultaneous
+platforms, wxWidgets has been structured to allow multiple, simultaneous
 installations of the library.  Common files are shared, platform and port
 specific files and libraries are arranged so as to be unambiguous when
 installed together.
@@ -18,7 +18,7 @@
 least at its time of writing) describes the system we have adopted.
 
 It is not fine grained enough to include every possible build configuration
-for wxWindows, but is encompassing enough to maintain a relatively complete
+for wxWidgets, but is encompassing enough to maintain a relatively complete
 set of cross platform build tools on a single machine and to provide an
 obvious slot for new ports to slip into.
 
@@ -61,7 +61,7 @@
 $version is a string encoding the full version (major, minor, release)
 for MSW, or just the major and minor number for UNIX.
 
-eg. for wxWindows 2.3.2, $version = 232 for MSW or 2.3 for UNIX.
+eg. for wxWidgets 2.3.2, $version = 232 for MSW or 2.3 for UNIX.
 
 The rationale for this is that under UNIX-like systems it is desirable
 that differently 'minor numbered' releases can be installed together,

Index: internal/wxPython-2.5/docs/tech/index.txt
diff -u internal/wxPython-2.5/docs/tech/index.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/index.txt:2.2
--- internal/wxPython-2.5/docs/tech/index.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/index.txt	Wed Sep 22 14:21:14 2004
@@ -1,23 +1,24 @@
-		All wxWindows techincal notes at a glance
+		All wxWidgets techincal notes at a glance
 		=========================================
 
 tn0001.txt   How to add a new sample
-tn0002.txt   wxWindows translator guide
-tn0003.txt   Adding wxWindows class documentation
+tn0002.txt   wxWidgets translator guide
+tn0003.txt   Adding wxWidgets class documentation
 tn0004.htm   *** Not currently applicable Compiling a sample in the C++Builder IDE
-tn0005.txt   Adding a wxWindows contribution
+tn0005.txt   Adding a wxWidgets contribution
 tn0006.txt   *** REMOVED *** (obsoleted by tn0013.txt)
 tn0007.txt   *** Not currently applicable Using and modifying the BC++ IDE files
-tn0008.htm   How to learn wxWindows programming
+tn0008.htm   How to learn wxWidgets programming
 tn0009.htm   Creating and converting icons
-tn0010.htm   Compiling wxWindows applications in the VC++ IDE
+tn0010.htm   Compiling wxWidgets applications in the VC++ IDE
 tn0011.txt   All about version numbers
-tn0012.txt   wxWindows platform, toolkit and library names
+tn0012.txt   wxWidgets platform, toolkit and library names
 tn0013.txt   How to make a wxGTK distribution
 tn0014.txt   XRC resources format specification
-tn0015.txt   How to add new bitmaps to wxWindows UI elements
-tn0016.txt   How to add new files and libraries to wxWindows build system (Bakefile)
-tn0017.txt   How to write unit tests for wxWindows classes
+tn0015.txt   How to add new bitmaps to wxWidgets UI elements
+tn0016.txt   How to add new files and libraries to wxWidgets build system (Bakefile)
+tn0017.txt   How to write unit tests for wxWidgets classes
+tn0018.txt   How to add a new font encoding/charset to wxWidgets?
 
 
-Version: $Id: index.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: index.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/docs/tech/tn0011.txt
diff -u internal/wxPython-2.5/docs/tech/tn0011.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0011.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0011.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0011.txt	Wed Sep 22 14:21:14 2004
@@ -1,9 +1,9 @@
-                 All about wxWindows Version Numbers
+                 All about wxWidgets Version Numbers
                  ===================================
 
 1. Where to update the version numbers:
 
-   There are several places in the wxWindows source tree that
+   There are several places in the wxWidgets source tree that
    define the version number for the library.  When updating the
    version number all of these places need edited:
 
@@ -27,11 +27,17 @@
 
 === EOF ===
 
-Version: $Id: tn0011.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0011.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $
 
 $Log: tn0011.txt,v $
-Revision 2.1.5.1  2004/04/09 01:15:20  markie
-Import from robin dunn tarball
+Revision 2.2  2004/09/22 21:21:14  heikki
+Bug 1472, upgrade to wxPython 2.5.2.9.
+
+Revision 2.1.5.1.4.2  2004/09/15 00:59:19  davids
+p4 changes.
+
+Revision 1.3  2004/05/04 08:26:58  JS
+Name change replacements
 
 Revision 1.2  2003/11/18 16:38:48  DS
 Horizontally aligned header (Like other technotes).

Index: internal/wxPython-2.5/docs/tech/tn0005.txt
diff -u internal/wxPython-2.5/docs/tech/tn0005.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0005.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0005.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0005.txt	Wed Sep 22 14:21:14 2004
@@ -1,20 +1,20 @@
-                     Adding a wxWindows contribution
+                     Adding a wxWidgets contribution
                      ===============================
 
 Here are some different kinds of contribution:
 
-1. Bug fixes. You can send these to the wx-devel list.
+1. Bug fixes. You can send these to the wx-dev list.
 2. New classes. New classes normally go in the contrib hierarchy:
    please see below for more details. They may be promoted to
-   the main wxWindows hierarchy if they are deemed to be 'core'.
+   the main wxWidgets hierarchy if they are deemed to be 'core'.
 3. A utility application, such as a new dialog editor or
    file format conversion utility. If adding to the CVS
    archive, you may put it under the utils hierarchy,
    preferably with further src and docs directories.
 
-You may or may not wish to add your code to the main wxWindows CVS
+You may or may not wish to add your code to the main wxWidgets CVS
 archive. Whether your code is appropriate for this archive
-should first be ascertained by discussing it on wx-devel at wxwindows.org.
+should first be ascertained by discussing it on wx-dev at wxwidgets.org.
 
 The contrib hierarchy
 ---------------------
@@ -23,7 +23,7 @@
 organise your files in the following hierarchy, so that
 when a user unarchives your contribution, it
 slots neatly into the existing source hierarchy.
-It also simplifies compilation for users, since wxWindows
+It also simplifies compilation for users, since wxWidgets
 makefiles and project files are set up to search in
 contrib/include/wx and contrib/lib. For example, to
 include yourclass.h, the following directive is used:
@@ -58,10 +58,10 @@
 (see Technote #16 for details).
 
 Your archive can be in .tgz or .zip format. For inclusion on
-the wxWindows ftp site and CD-ROM, please send your submission to
-Julian Smart <julian at wxwindows.org> as a binary attachment.
+the wxWidgets ftp site and CD-ROM, please send your submission to
+Julian Smart <julian at wxwidgets.org> as a binary attachment.
 An entry will be added to the Contributions web page.
 
 Author:  Julian Smart
-Version: $Id: tn0005.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0005.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $
 

Index: internal/wxPython-2.5/distrib/msw/dsp2dos.bat
diff -u internal/wxPython-2.5/distrib/msw/dsp2dos.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/dsp2dos.bat:2.2
--- internal/wxPython-2.5/distrib/msw/dsp2dos.bat:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/dsp2dos.bat	Wed Sep 22 14:21:02 2004
@@ -1,7 +1,7 @@
 echo "dsp2dos [ver. 1.1]"
-echo "Convert wxWindows workspaces from Unix to Dos format"
+echo "Convert wxWidgets workspaces from Unix to Dos format"
 echo "  Author : Marco Cavallini (www.koansoftware.com)"
-echo "You need to build wxWindows/distrib/msw/unix2dos.c for using it"
+echo "You need to build wxWidgets/distrib/msw/unix2dos.c for using it"
 unix2dos --unix2dos $WXWIN/src/wxBase.dsp
 unix2dos --unix2dos $WXWIN/src/wxBase.dsw
 unix2dos --unix2dos $WXWIN/src/wxUniv.dsp

Index: internal/wxPython-2.5/distrib/msw/unix2dos.c
diff -u internal/wxPython-2.5/distrib/msw/unix2dos.c:2.1.5.1 internal/wxPython-2.5/distrib/msw/unix2dos.c:2.2
--- internal/wxPython-2.5/distrib/msw/unix2dos.c:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/unix2dos.c	Wed Sep 22 14:21:02 2004
@@ -69,14 +69,14 @@
             char tmpFile[512];
             sprintf(tmpFile, "%s.tmp", argv[i]);
             
-            fp = fopen(argv[i], "r");
+            fp = fopen(argv[i], "rb");
             if (!fp)
             {
                 fprintf(stderr, "Cannot open %s.\n", argv[i]);
                 i ++;
                 continue;
             }
-            outFile = fopen(tmpFile, "w");
+            outFile = fopen(tmpFile, "wb");
             if (!outFile)
             {
                 fprintf(stderr, "Cannot open %s.\n", tmpFile);
@@ -112,20 +112,28 @@
     int c,d;
     
     if (!unix2Dos)
+    {
         /* DOS2Unix */
-        while ((c = getc(ifp)) != EOF){
+        while ((c = getc(ifp)) != EOF)
+        {
             if (c == CR)
-                switch(d = getc(ifp)){ /* check to see if LF follows */
-    case LF:
-        putc(d,ofp);         /* if so, ignore CR */
-        break;
-    default:
-        putc(c,ofp);         /* if not, output CR and following char */
-        putc(d,ofp);
-            }   else putc(c, ofp); /* c is not a CR */
+            {
+                switch(d = getc(ifp))
+                { /* check to see if LF follows */
+                    case LF:
+                        putc(d,ofp);         /* if so, ignore CR */
+                        break;
+                    default:
+                        putc(c,ofp);         /* if not, output CR and following char */
+                        putc(d,ofp);
+                }
+            }
+            else
+                putc(c, ofp); /* c is not a CR */
         }
-        
-        else
+     }
+     else
+        {
             /* Unix2DOS */
             while ((c = getc(ifp)) != EOF){
                 if (c == CR)
@@ -134,6 +142,7 @@
                     putc(CR, ofp); /* add CR before each LF */
                 putc(c, ofp);
             }
+        }
 }
 
 void usage()

Index: internal/wxPython-2.5/docs/tech/tn0016.txt
diff -u internal/wxPython-2.5/docs/tech/tn0016.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0016.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0016.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0016.txt	Wed Sep 22 14:21:14 2004
@@ -1,11 +1,11 @@
-         How to add new files and libraries to wxWindows build system
+         How to add new files and libraries to wxWidgets build system
          ============================================================
 
 
 1. Regenerating makefiles
 -------------------------
 
-wxWindows now uses Bakefile (http://bakefile.sourceforge.net) to generate
+wxWidgets now uses Bakefile (http://bakefile.sourceforge.net) to generate
 native makefiles. You must have bakefile installed if you want to regenerate
 the makefiles. Bakefile currently runs on Unix and Windows systems. You will
 need Python >= 2.2 installed on Unix and either use Bakefile installer or have
@@ -18,7 +18,7 @@
 
 Note that it generates makefiles for samples and contrib libraries, too.
 
-IMPORTANT NOTE: Don't forget to run autoconf in wxWindows root directory
+IMPORTANT NOTE: Don't forget to run autoconf in wxWidgets root directory
                 (after running Bakefile) if you changed any conditional
                 variable or target condition in .bkl files! You will know that
                 this happened if $(wx)/autoconf_inc.m4 content changed.
@@ -225,4 +225,4 @@
 
 === EOF ===
 
-Version: $Id: tn0016.txt,v 2.1.5.1 2004/04/09 01:15:20 markie Exp $
+Version: $Id: tn0016.txt,v 2.2 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/distrib/msw/tmake/x11.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/x11.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/x11.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/x11.t:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/x11.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          list of files for wxMotif library is generated by tmake
 #! Author:  Vadim Zeitlin
 #! Created: 28.01.00
-#! Version: $Id: x11.t,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+#! Version: $Id: x11.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes

Index: internal/wxPython-2.5/docs/x11/readme.txt
diff -u internal/wxPython-2.5/docs/x11/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/x11/readme.txt:2.2
--- internal/wxPython-2.5/docs/x11/readme.txt:2.1.5.1	Thu Apr  8 18:15:21 2004
+++ internal/wxPython-2.5/docs/x11/readme.txt	Wed Sep 22 14:21:17 2004
@@ -1,16 +1,16 @@
 
-  Welcome to wxWindows/X11 2.5.1
+  Welcome to wxWidgets/X11 2.5.2
 
-You have downloaded version 2.5.1 of the X11 port of
-the wxWindows GUI library. This runs on X11 with no
+You have downloaded version 2.5.2 of the X11 port of
+the wxWidgets GUI library. This runs on X11 with no
 Motif, Xt, GTK+ or any other standard widget set --
 instead it uses the wxUniversal widgets. The intention
 is to have it run on NanoX as well as desktop X11.
 
-More information about the wxWindows project as a whole
+More information about the wxWidgets project as a whole
 can be found at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
   
 Information on how to install can be found in the file 
 install.txt, but if you cannot wait, this should work on
@@ -27,22 +27,22 @@
 When you run into problems, please read the install.txt and
 follow those instructions. If you still don't have any success,
 please send a bug report to one of our mailing lists (see
-the wxWindows homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
+the wxWidgets homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
 YOUR PROBLEM, SUCH AS YOUR VERSION OF X, WHAT DISTRIBUTION YOU USE
 AND WHAT ERROR WAS REPORTED. Alternatively, you may also use the bug
-reporting system linked from the wxWindows web page.
+reporting system linked from the wxWidgets web page.
 
 The library produced by the install process will be called 
 libwx_x11univ[d].a (static) and libwx_x11univ[d]-2.3.so.0.0.0
 (shared) so that once a binary incompatible version of
-wxWindows/X11 comes out we'll augment the library version number
+wxWidgets/X11 comes out we'll augment the library version number
 to avoid linking problems.
 
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
-on how to subscribe is available from www.wxwindows.org.
+bug reports or comments to the wxWidgets users list. Information 
+on how to subscribe is available from www.wxwidgets.org.
 
-wxWindows/X11 doesn't come with any guarantee whatsoever. It might 
+wxWidgets/X11 doesn't come with any guarantee whatsoever. It might 
 crash your hard disk or destroy your monitor. It doesn't claim to be
 suitable for any special or general purpose.
 
@@ -67,5 +67,5 @@
 
   Regards,
 
-  The wxWindows team
+  The wxWidgets team
 

Index: internal/wxPython-2.5/distrib/mac/pbsetup-sh
diff -u internal/wxPython-2.5/distrib/mac/pbsetup-sh:2.1.5.1 internal/wxPython-2.5/distrib/mac/pbsetup-sh:2.2
--- internal/wxPython-2.5/distrib/mac/pbsetup-sh:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/mac/pbsetup-sh	Wed Sep 22 14:21:02 2004
@@ -5,7 +5,7 @@
 #-- Author:      Gilles Depeyrot
 #-- Modified by:
 #-- Created:     12.09.2003
-#-- RCS-ID:      $Id: pbsetup-sh,v 2.1.5.1 2004/04/09 01:15:14 markie Exp $
+#-- RCS-ID:      $Id: pbsetup-sh,v 2.2 2004/09/22 21:21:02 heikki Exp $
 #-- Copyright:   (c) 2003 Gilles Depeyrot
 #-- Licence:     wxWindows licence
 #-----------------------------------------------------------------------------

Index: internal/wxPython-2.5/distrib/msw/cw_mac.rsp
diff -u internal/wxPython-2.5/distrib/msw/cw_mac.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/cw_mac.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/cw_mac.rsp:2.1.5.1	Thu Apr  8 18:15:14 2004
+++ internal/wxPython-2.5/distrib/msw/cw_mac.rsp	Wed Sep 22 14:21:02 2004
@@ -151,8 +151,6 @@
 samples/widgets/*.mcp
 samples/wizard/*M?.xml
 samples/wizard/*.mcp
-samples/wxtest/*M?.xml
-samples/wxtest/*.mcp
 
 utils/helpview/src/*M?.xml
 utils/helpview/src/*.mcp

Index: internal/wxPython-2.5/distrib/msw/zipwinminimal.bat
diff -u internal/wxPython-2.5/distrib/msw/zipwinminimal.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/zipwinminimal.bat:2.2
--- internal/wxPython-2.5/distrib/msw/zipwinminimal.bat:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/zipwinminimal.bat	Wed Sep 22 14:21:02 2004
@@ -21,7 +21,7 @@
 erase %dest\wxMSW-%VERSION%-Minimal*.zip
 
 if not direxist %dest mkdir %dest
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
 
 echo Zipping wxMSW-Minimal distribution
 
@@ -33,10 +33,10 @@
 zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\zlib.rsp
 zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\tiff.rsp
 
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
 
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
+mkdir %dest%\wxWidgets-%version%
+cd %dest%\wxWidgets-%version%
 
 unzip32 ..\wxMSW-%version%-Minimal.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
@@ -54,7 +54,7 @@
 cd %dest%
 
 erase wxMSW-%version%-Minimal.zip
-zip32 -r wxMSW-%version%-Minimal.zip wxWindows-%version%/*
+zip32 -r wxMSW-%version%-Minimal.zip wxWidgets-%version%/*
 
 echo wxMSW-Minimal archived.
 
@@ -63,7 +63,7 @@
 goto end
 
 :usage
-echo DOS wxWindows distribution. Zips up wxMSW-Minimal.
+echo DOS wxWidgets distribution. Zips up wxMSW-Minimal.
 echo.
 echo "Usage: zipwinminimal.bat"
 

Index: internal/wxPython-2.5/distrib/msw/vc.rsp
diff -u internal/wxPython-2.5/distrib/msw/vc.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/vc.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/vc.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/vc.rsp	Wed Sep 22 14:21:02 2004
@@ -3,12 +3,8 @@
 
 src/wxWindows.dsp
 src/wxWindows.dsw
-src/wxUniv.dsp
-src/wxUniv.dsw
 src/wxBase.dsp
 src/wxBase.dsw
-src/msw/wince/wxWindowsCE.vcp
-src/msw/wince/wxWindowsCE.vcw
 
 src/jpeg/jpeg.dsp
 src/jpeg/jpeg.dsw
@@ -35,9 +31,6 @@
 samples/artprov/artprov.dsp
 samples/artprov/artprov.dsw
 
-samples/calendar/arttest.dsp
-samples/calendar/arttest.dsw
-
 samples/calendar/calendar.dsp
 samples/calendar/calendar.dsw
 
@@ -61,10 +54,6 @@
 
 samples/dialogs/dialogs.dsp
 samples/dialogs/dialogs.dsw
-samples/dialogs/dialogsUniv.dsp
-samples/dialogs/dialogsUniv.dsw
-samples/dialogs/dialogsCE.vcp
-samples/dialogs/dialogsCE.vcw
 
 samples/dialup/dialup.dsp
 samples/dialup/dialup.dsw
@@ -75,15 +64,15 @@
 samples/dnd/dnd.dsp
 samples/dnd/dnd.dsw
 
-samples/dragimag/dragimag.dsp
-samples/dragimag/dragimag.dsw
-
 samples/docview/docview.dsp
 samples/docview/docview.dsw
 
 samples/docvwmdi/docvwmdi.dsp
 samples/docvwmdi/docvwmdi.dsw
 
+samples/dragimag/dragimag.dsp
+samples/dragimag/dragimag.dsw
+
 samples/drawing/drawing.dsp
 samples/drawing/drawing.dsw
 
@@ -96,17 +85,20 @@
 samples/event/event.dsp
 samples/event/event.dsw
 
-samples/exec/exec.dsp
-samples/exec/exec.dsw
+samples/except/except.dsp
+samples/except/except.dsw
 
 samples/except/except.dsp
 samples/except/except.dsw
 
+samples/exec/exec.dsp
+samples/exec/exec.dsw
+
 samples/font/font.dsp
 samples/font/font.dsw
 
-samples/grid/griddemo.dsp
-samples/grid/griddemo.dsw
+samples/grid/grid.dsp
+samples/grid/grid.dsw
 
 samples/help/help.dsp
 samples/help/help.dsw
@@ -130,6 +122,8 @@
 samples/html/widget/widget.dsw
 samples/html/zip/zip.dsp
 samples/html/zip/zip.dsw
+samples/html/htmlctrl/htmlctrl.dsw
+samples/html/htmlctrl/htmlctrl.dsp
 
 samples/image/image.dsp
 samples/image/image.dsw
@@ -137,22 +131,22 @@
 samples/internat/internat.dsp
 samples/internat/internat.dsw
 
-samples/keyboard/keyboard.dsp
-samples/keyboard/keyboard.dsw
-
 samples/ipc/client.dsp
 samples/ipc/client.dsw
 samples/ipc/server.dsp
 samples/ipc/server.dsw
 
+samples/keyboard/keyboard.dsp
+samples/keyboard/keyboard.dsw
+
 samples/joytest/joytest.dsp
 samples/joytest/joytest.dsw
 
 samples/layout/layout.dsp
 samples/layout/layout.dsw
 
-samples/listbox/lboxtest.dsp
-samples/listbox/lboxtest.dsw
+samples/listbox/listbox.dsp
+samples/listbox/listbox.dsw
 
 samples/listctrl/listctrl.dsp
 samples/listctrl/listctrl.dsw
@@ -171,18 +165,17 @@
 
 samples/minimal/minimal.dsp
 samples/minimal/minimal.dsw
-samples/minimal/minimalUniv.dsp
-samples/minimal/minimalCE.vcp
-samples/minimal/minimalCE.vcw
 
 samples/minifram/minifram.dsp
 samples/minifram/minifram.dsw
 
 samples/mobile/styles/styles.dsp
+samples/mobile/styles/styles.dsw
+samples/mobile/wxedit/wxedit.dsp
 samples/mobile/wxedit/wxedit.dsw
 
-samples/multimon/multimon_test.dsp
-samples/multimon/multimon_test.dsw
+samples/multimon/multimon.dsp
+samples/multimon/multimon.dsw
 
 samples/nativdlg/nativdlg.dsp
 samples/nativdlg/nativdlg.dsw
@@ -234,6 +227,9 @@
 samples/sound/sound.dsp
 samples/sound/sound.dsw
 
+samples/splash/splash.dsp
+samples/splash/splash.dsw
+
 samples/splitter/splitter.dsp
 samples/splitter/splitter.dsw
 
@@ -267,14 +263,8 @@
 samples/wizard/wizard.dsp
 samples/wizard/wizard.dsw
 
-samples/wxtest/wxtest.dsp
-samples/wxtest/wxtest.dsw
-
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
-samples/widgets/widgetsUniv.dsp
-samples/widgets/widgetsCE.vcp
-samples/widgets/widgetsCE.vcw
 
 samples/opengl/cube/cube.dsp
 samples/opengl/cube/cube.dsw
@@ -285,8 +275,6 @@
 
 demos/bombs/bombs.dsp
 demos/bombs/bombs.dsw
-demos/bombs/bombsCE.vcp
-demos/bombs/bombsCE.vcw
 
 demos/dbbrowse/dbbrowse.dsp
 demos/dbbrowse/dbbrowse.dsw
@@ -299,13 +287,9 @@
 
 demos/life/life.dsp
 demos/life/life.dsw
-demos/life/lifeCE.vcp
-demos/life/lifeCE.vcw
 
 demos/poem/poem.dsp
 demos/poem/poem.dsw
-demos/poem/poemCE.vcp
-demos/poem/poemCE.vcw
 
 utils/tex2rtf/src/tex2rtf_tex2rtf.dsp
 utils/tex2rtf/src/tex2rtf_tex2rtf_gui.dsp
@@ -350,8 +334,8 @@
 contrib/utils/convertrc/convertrc.dsp
 contrib/utils/convertrc/convertrc.dsw
 
-contrib/utils/wxrcedit/wxRcEditVC.dsp
-contrib/utils/wxrcedit/wxRcEditVC.dsw
+contrib/utils/wxrcedit/wxrcedit.dsp
+contrib/utils/wxrcedit/wxrcedit.dsw
 
 contrib/build/plot/plot.dsp
 contrib/build/plot/plot.dsw
@@ -375,8 +359,8 @@
 
 contrib/build/animate/animate.dsp
 contrib/build/animate/animate.dsw
-contrib/samples/animate/AniTestVC.dsp
-contrib/samples/animate/AniTestVC.dsw
+contrib/samples/animate/anitest.dsp
+contrib/samples/animate/anitest.dsw
 
 contrib/samples/fl/fl.dsp
 contrib/samples/fl/fl.dsw

Index: internal/wxPython-2.5/docs/tech/tn0018.txt
diff -u /dev/null internal/wxPython-2.5/docs/tech/tn0018.txt:2.1
--- /dev/null	Wed Sep 22 14:21:24 2004
+++ internal/wxPython-2.5/docs/tech/tn0018.txt	Wed Sep 22 14:21:14 2004
@@ -0,0 +1,68 @@
+                 How to add a new font encoding to wxWidgets
+                 ===========================================
+
+I. Introduction
+---------------
+
+ wxWidgets has built in support for a certain number of font encodings (which
+is synonymous with code sets and character sets for us here even though it is
+not exactly the same thing), look at include/wx/fontenc.h for the full list.
+This list is far from being exhaustive though and if you have enough knowledge
+about an encoding to add support for it to wxWidgets, this tech note is for
+you!
+
+ A word of warning though: this is written out of my head and is surely
+incomplete. Please correct the text here, especially if you detect problems
+when you try following it.
+
+ Also note that I completely ignore all the difficult issues of support for
+non European languages in the GUI (i.e. BiDi and text orientation support).
+
+
+II. The receipt
+---------------
+
+Suppose you want to add support for Klingon to wxWidgets. This is what you'd
+have to do:
+
+1. include/wx/fontenc.h: add a new wxFONTENCODING_KLINGON enum element, if
+   possible without changing the values of the existing elements of the enum
+   and be careful to now make it equal to some other elements -- this means
+   that you have to put it before wxFONTENCODING_MAX
+
+2. wxFONTENCODING_MAX must be the same as the number of elements in 3
+   (hopefully) self explanatory arrays in src/common/fmapbase.cpp:
+   a) gs_encodings
+   b) gs_encodingDescs
+   c) gs_encodingNames
+
+   You must update all of them, e.g. you'd add wxFONTENCODING_KLINGON,
+   "Klingon (Star Trek)" and "klingon" to them in this example. The latter
+   name should ideally be understandable to both Win32 and iconv as it is used
+   to convert to/from this encoding under Windows and Unix respectively.
+   Typically any reasonable name will be supported by iconv, if unsure run
+   "iconv -l" on your favourite Unix system. For the list of charsets
+   supported under Win32, look under HKEY_CLASSES_ROOT\MIME\Database\Charset
+   in regedit. Of course, being consistent with the existing encoding names
+   wouldn't hurt neither.
+
+3. Normally you don't have to do anything else if you've got support for this
+   encoding under both Win32 and Unix. If you haven't, you should modify
+   wxEncodingConverter to support it (this could be useful anyhow as a
+   fallback for systems where iconv is unavailable). To do it you must:
+   a) add a new table to src/common/unictabl.inc: note that this file is auto
+      generated so you have to modify misc/unictabl script instead (probably)
+   b) possibly update EquivalentEncodings table in src/common/encconv.cpp
+      if wxFONTENCODING_KLINGON can be converted into another one
+      (losslessly only or not?)
+
+4. Add a unit test (see tn0017.txt) for support of your new encoding (with
+   time we should have a wxCSConv unit test so you would just add a case to
+   it for wxFONTENCODING_KLINGON) and test everything on as many different
+   platforms as you can.
+
+
+=== EOF ===
+
+Author:  VZ
+Version: $Id: tn0018.txt,v 2.1 2004/09/22 21:21:14 heikki Exp $

Index: internal/wxPython-2.5/docs/gtk/readme.txt
diff -u internal/wxPython-2.5/docs/gtk/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/gtk/readme.txt:2.2
--- internal/wxPython-2.5/docs/gtk/readme.txt:2.1.5.1	Thu Apr  8 18:15:18 2004
+++ internal/wxPython-2.5/docs/gtk/readme.txt	Wed Sep 22 14:21:06 2004
@@ -1,20 +1,20 @@
 
-   Welcome to wxWindows/Gtk 2.5
+   Welcome to wxWidgets/Gtk 2.5
 
 You have downloaded version 2.5 of the GTK port of the 
-wxWindows GUI library.
+wxWidgets GUI library.
 
-wxWindows no longer supports GTK 1.0 (as did some early
+wxWidgets no longer supports GTK 1.0 (as did some early
 snapshots) so that you will need GTK 1.2 when using it.
 GTK 1.2.6 or above is recommended although some programs 
 will work with GTK 1.2.3 onwards. There is now support
 for GTK 2.0.
 
-More info about the wxWindows project (including the
+More info about the wxWidgets project (including the
 Windows, X11/Motif and other ports) can be found at the main
-wxWindows homepage at:
+wxWidgets homepage at:
 
-                  http://www.wxwindows.org
+                  http://www.wxwidgets.org
   
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
@@ -56,16 +56,16 @@
 switch was used or if shared libraries are not supported at all
 on your platform which is quite unlikely) and
 libwx_gtk-2.2.so.0.0.0 (shared) so that once a binary
-incompatible version of wxWindows/Gtk comes out we'll augment
+incompatible version of wxWidgets/Gtk comes out we'll augment
 the library version number to avoid linking problems.
 
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
+bug reports or comments to the wxWidgets users list. Information 
 on how to subscribe is available from my homepage.
 
 Do NOT send any comments directly to me.
 
-wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
+wxWidgets/Gtk doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.
 

Index: internal/wxPython-2.5/docs/tech/tn0003.txt
diff -u internal/wxPython-2.5/docs/tech/tn0003.txt:2.1.5.1 internal/wxPython-2.5/docs/tech/tn0003.txt:2.2
--- internal/wxPython-2.5/docs/tech/tn0003.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/tech/tn0003.txt	Wed Sep 22 14:21:14 2004
@@ -1,15 +1,15 @@
-                     Adding wxWindows class documentation
+                     Adding wxWidgets class documentation
                      ====================================
 
 This note is aimed at people wishing to add documentation for a
-class to either the main wxWindows manual, or to their own
+class to either the main wxWidgets manual, or to their own
 manual.
 
-wxWindows uses Tex2RTF to process Latex-like input files (.tex)
+wxWidgets uses Tex2RTF to process Latex-like input files (.tex)
 and output in HTML, WinHelp RTF and Word RTF. Tex2RTF is provided
-in the wxWindows distribution and in the CVS archive, under
+in the wxWidgets distribution and in the CVS archive, under
 utils/tex2rtf. Please start by perusing the Tex2RTF manual.
-See http://www.wxwindows.org/tex2rtf/index.htm for a browseable
+See http://www.wxwidgets.org/tex2rtf/index.htm for a browseable
 manual and binaries for specific platforms.
 
 If adding to the existing manual in docs/latex/wx, you need to
@@ -20,7 +20,7 @@
 to category.tex.
 
 If compiling a separate manual, copy an existing set of files from the
-wxWindows manual or a contribution. Contribution documentation
+wxWidgets manual or a contribution. Contribution documentation
 normally goes in the contrib/docs hierarchy, with the source
 going in a latex/mycontrib subdirectory.
 
@@ -55,12 +55,12 @@
    tex2rtf manual.tex manual.rtf -rtf -twice -interactive
 
 NOTE: You must be using the latest tex2rtf which was released with
-v2.2.0 of wxWindows to use the -interactive switch
+v2.2.0 of wxWidgets to use the -interactive switch
 
 If you wish to generate documentation for wxHTML Help Viewer
 (or Windows HTML Help), set htmlWorkshopFiles to true in your
 tex2rtf.ini file. See also the wxHTML Notes section in the
-wxWindows manual. To further speed-up HTML help books loading
+wxWidgets manual. To further speed-up HTML help books loading
 in your application, you may use hhp2cached (utils/hhp2cached).
 
 src/msw/makefile.vc contains targets for generating various

Index: internal/wxPython-2.5/distrib/msw/zipdist.sh
diff -u internal/wxPython-2.5/distrib/msw/zipdist.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/zipdist.sh:2.2
--- internal/wxPython-2.5/distrib/msw/zipdist.sh:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/zipdist.sh	Wed Sep 22 14:21:02 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Zip up an external, generic + Windows distribution of wxWindows 2
+# Zip up an external, generic + Windows distribution of wxWidgets 2
 SRC=`cygpath -u $WXWIN`
 DEST=$SRC/deliver
 WISE=0
@@ -22,16 +22,16 @@
 
     # After this change of directory, we're in the
     # temporary 'wx' directory and not acting on
-    # the source wxWindows directory.
+    # the source wxWidgets directory.
     cd $DEST/wx
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-msw.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-gen.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-vc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-bc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-HTMLHelp.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-msw.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-gen.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-vc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-bc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-HTMLHelp.zip`
     unzip -o `$CYGPATHPROG -w ../extradoc.zip`
     # Need Word file, for Remstar DB classes
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-Word.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-Word.zip`
     unzip -o `$CYGPATHPROG -w ../ogl3.zip`
     unzip -o `$CYGPATHPROG -w ../jpeg.zip`
     unzip -o `$CYGPATHPROG -w ../tiff.zip`
@@ -75,7 +75,7 @@
     # Now invoke WISE install on the new wxwin2.wse
     echo Invoking WISE...
     /c/progra~1/wise/wise32.exe /C $WXWIN\\distrib\\msw\\wxwin2.wse
-    echo Press return to continue with the wxWindows distribution...
+    echo Press return to continue with the wxWidgets distribution...
     read dummy
 
     cd $DEST
@@ -183,58 +183,58 @@
 # for local use, and for creating wxMSW-xxx.zip.
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
 expandlines $SRC/distrib/msw/generic.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/msw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/gtk.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/stubs.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-stubs.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-stubs.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/motif.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 
 expandlines $SRC/distrib/msw/docsrc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-DocSource.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-DocSource.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_hlp.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-WinHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-WinHelp.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_pdf.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-PDF.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-PDF.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_word.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-Word.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-Word.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_htb.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTB.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTB.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_chm.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTMLHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTMLHelp.zip` < temp.txt
 
 # PDF/HTML docs that should go into the Windows setup because
 # there are no WinHelp equivalents
@@ -243,15 +243,15 @@
 
 # VC++ project files
 expandlines $SRC/distrib/msw/vc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-vc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-vc.zip` < temp.txt
 
 # BC++ project files
 expandlines $SRC/distrib/msw/bc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-bc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-bc.zip` < temp.txt
 
 # CodeWarrior project files
 expandlines $SRC/distrib/msw/cw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-cw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-cw.zip` < temp.txt
 
 # OGL 3
 expandlines $SRC/distrib/msw/ogl.rsp temp.txt
@@ -306,5 +306,5 @@
     dowise
 fi
 
-echo wxWindows archived.
+echo wxWidgets archived.
 

Index: internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro
diff -u internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro:2.1.5.1	Thu Apr  8 18:15:16 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/wxwin.pro	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #          tmake -t vc wxwin.pro
 # Author:  Vadim Zeitlin
 # Created: 14.07.99
-# Version: $Id: wxwin.pro,v 2.1.5.1 2004/04/09 01:15:16 markie Exp $
+# Version: $Id: wxwin.pro,v 2.2 2004/09/22 21:21:03 heikki Exp $
 ###############################################################################
 
 # this file is empty

Index: internal/wxPython-2.5/distrib/msw/tmake/filelist.t
diff -u internal/wxPython-2.5/distrib/msw/tmake/filelist.t:2.1.5.1 internal/wxPython-2.5/distrib/msw/tmake/filelist.t:2.2
--- internal/wxPython-2.5/distrib/msw/tmake/filelist.t:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tmake/filelist.t	Wed Sep 22 14:21:03 2004
@@ -4,7 +4,7 @@
 #!          file - this is used by all other templates.
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
-#! Version: $Id: filelist.t,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+#! Version: $Id: filelist.t,v 2.2 2004/09/22 21:21:03 heikki Exp $
 #!#############################################################################
 #${
     use lib './lib';

Index: internal/wxPython-2.5/distrib/msw/splitwise.cpp
diff -u internal/wxPython-2.5/distrib/msw/splitwise.cpp:2.1.5.1 internal/wxPython-2.5/distrib/msw/splitwise.cpp:2.2
--- internal/wxPython-2.5/distrib/msw/splitwise.cpp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/splitwise.cpp	Wed Sep 22 14:21:02 2004
@@ -20,9 +20,9 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     13/10/99
-// RCS-ID:      $Id: splitwise.cpp,v 2.1.5.1 2004/04/09 01:15:15 markie Exp $
+// RCS-ID:      $Id: splitwise.cpp,v 2.2 2004/09/22 21:21:02 heikki Exp $
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 

Index: internal/wxPython-2.5/distrib/msw/zippatch.bat
diff -u internal/wxPython-2.5/distrib/msw/zippatch.bat:2.1.5.1 internal/wxPython-2.5/distrib/msw/zippatch.bat:2.2
--- internal/wxPython-2.5/distrib/msw/zippatch.bat:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/zippatch.bat	Wed Sep 22 14:21:02 2004
@@ -6,12 +6,12 @@
 set src=%wxwin%
 set dest=%src%\deliver
 
-Rem Set this to the required wxWindows version
+Rem Set this to the required wxWidgets version
 set wxversion=2.3.3
 Rem Set this to the required patch version
 set version=01
 
-set patchname=wxWindows-%wxversion%-patch-%version%.zip
+set patchname=wxWidgets-%wxversion%-patch-%version%.zip
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -21,20 +21,20 @@
 echo CTRL-C if this is not correct.
 pause
 
-erase /Q /E %dest%\wxWindows-*-patch*.zip
+erase /Q /E %dest%\wxWidgets-*-patch*.zip
 
 cd %src%
 echo Zipping...
 
 zip32 -@ %dest%\%patchname% < %src%\distrib\msw\patch.rsp
-echo wxWindows patch archived.
+echo wxWidgets patch archived.
 
 cd %dest
 
 goto end
 
 :usage
-echo wxWindows patch distribution.
+echo wxWidgets patch distribution.
 echo.
 echo Usage: zippatch
 echo You must set WXWIN appropriately before calling this script.

Index: internal/wxPython-2.5/docs/publicity/publicity.txt
diff -u internal/wxPython-2.5/docs/publicity/publicity.txt:2.1.5.1 internal/wxPython-2.5/docs/publicity/publicity.txt:2.2
--- internal/wxPython-2.5/docs/publicity/publicity.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/publicity/publicity.txt	Wed Sep 22 14:21:13 2004
@@ -89,11 +89,11 @@
 
    [where is the announcement text? TODO]
 
-c) update www.wxwindows.org
+c) update www.wxwidgets.org
 
 d) GNOME (very effective, stays on front page for days):
     - http://www.gnome.org/applist
-    - Search for wxWindows
+    - Search for wxWidgets
     - Update the version number
     - Ignore the error message
 

Index: internal/wxPython-2.5/docs/readme.txt
diff -u internal/wxPython-2.5/docs/readme.txt:2.1.5.1 internal/wxPython-2.5/docs/readme.txt:2.2
--- internal/wxPython-2.5/docs/readme.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/readme.txt	Wed Sep 22 14:21:04 2004
@@ -1,4 +1,4 @@
-wxWindows 2.5.1
+wxWidgets 2.5.2
 ---------------
 
 *** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
@@ -9,7 +9,7 @@
 *** may change in backwards incompatible way. If this doesn't frighten
 *** you, do try this release and please let us know what you think!
 
-Welcome to wxWindows, a sophisticated cross-platform C++
+Welcome to wxWidgets, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where
 possible) the native controls.
 
@@ -35,90 +35,30 @@
 Platforms supported
 -------------------
 
-wxWindows currently supports the following platforms:
+wxWidgets currently supports the following platforms:
 
-- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
-- Most Unix variants with GTK+
-- Most Unix variants with X11
+- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP, Pocket PC
+- Most Unix variants with GTK+ 1 and GTK+ 2
+- Most Unix variants with X11 (beta)
 - Most Unix variants with Motif/Lesstif
-- MacOS 9.x and 10.x
-- OS/2 (alpha)
+- MacOS 9.x and 10.x using Carbon (10.3 and above preferred)
+- MacOS 10.x using Cocoa (beta)
+- OS/2 (beta)
 
 Most popular C++ compilers are supported; see the install.txt
 file for each platform (available via docs/html/index.htm) for details.
-See also http://www.wxwindows.org/platform.htm.
+See also http://www.wxwidgets.org/platform.htm.
 
 Files
 -----
 
 The distribution is available in archive formats appropriate to the
-target system. Documentation is available mainly in zip format.
-In the following, x.y.z represents the current version number.
-
-wxWindows for GTK+ distribution
--------------------------------
-
-wxGTK-x.y.z.tar.gz                 wxGTK source distribution. You will
-                                   need the HTML, HTB and/or PDF documentation
-                                   (see below)
-wxGTK-demos-x.y.z.tar.gz           wxGTK demos source
-wxGTK-samples-x.y.z.tar.gz         wxGTK samples source
-wxGTK-x.y.z-0.src.rpm              wxGTK Linux source as an RPM, without manuals
-wxGTK-x.y.z-0.i386.rpm             wxGTK Linux binaries as an RPM, without manuals
-wxGTK-devel-x.y.z-0.i386.rpm       wxGTK Linux minimum development system as an RPM
-wxGTK-gl-x.y.z-0.i386.rpm          Add-on OpenGL binary as an RPM
-
-wxWindows for X11 and Motif distribution
-----------------------------------------
-
-wxX11-x.y.z.tar.gz                 wxX11 and wxMotif source distribution, without
-                                   documentation.
-
-wxWindows for MS Windows distribution
--------------------------------------
-
-setup.exe, setup-*.bin             Setup files in floppy-disk-sized chunks
-wxMSW-x.y.z-setup.zip              Zip archive containing the
-                                   setup files
-wxMSW-x.y.z.zip                    Zip archive containing all the files that are
-                                   in the setup distribution
-
-As well as the core source, the wxMSW distribution contains:
-
-- Windows HTML Help versions of the documentation (docs/htmlhelp);
-- a Tex2RTF binary;
-- Life! sample binary.
-
-wxWindows for MacOS distribution
---------------------------------
-
-wxMac-x.y.z.zip                    Zip archive containing all
-                                   source files (excludes documentation)
-wxMac-x.y.z.tar.gz                 Gzipped tar archive containing all
-                                   source files (excludes documentation).
-                                   You might prefer this format if building on
-                                   MacOS X, since it preserves file permissions.
-
-wxWindows for OS/2 distribution
--------------------------------
-
-wxOS2-x.y.z.zip                    Zip archive containing all source files
-                                   (excludes documentation)
-
-Documentation files
--------------------
-
-wxWindows-x.y.z-WinHelp.zip        WinHelp documentation
-wxWindows-x.y.z-PDF.zip            Acrobat PDF documentation
-wxWindows-x.y.z-HTML.zip           HTML documentation
-wxWindows-x.y.z-HTMLHelp.zip       Windows HTML Help documentation
-wxWindows-x.y.z-HTB.zip            wxHTML documentation (for
-                                   use with the helpview utility)
+target system. See the download pages for details.
 
 Installation
 ------------
 
-wxWindows 2 needs to be compiled before you can test out
+wxWidgets 2 needs to be compiled before you can test out
 the samples or write your own applications.
 For installation information, please see the install.txt file
 in the individual directories:
@@ -143,12 +83,12 @@
   docs/lgpl.txt
 
 Although this may seem complex, it is there to allow authors of
-proprietary/commercial applications to use wxWindows in
+proprietary/commercial applications to use wxWidgets in
 addition to those writing GPL'ed applications. In summary,
 the licence is LGPL plus a clause allowing unrestricted
 distribution of application binaries. To answer a FAQ, you
 don't have to distribute any source if you wish to write
-commercial applications using wxWindows. 
+commercial applications using wxWidgets. 
 
 However, if you distribute wxGTK or wxMotif (with Lesstif) version
 of your application, don't forget that it is linked against
@@ -159,7 +99,7 @@
 linked against LGPL library. Basically you should link dynamically and
 include source code of LGPL libraries with your product (unless it is
 already present in user's system - like glibc usually is).
-If compiled with --enable-odbc (Unix only), wxWindows library will 
+If compiled with --enable-odbc (Unix only), wxWidgets library will 
 contain iODBC library which is covered by LGPL.
 
 If you use TIFF image handler, please see src/tiff/COPYRIGHT
@@ -175,17 +115,16 @@
 
 If you use wxXML classes or XRC, see src/expat/COPYING for licence details.
 
-
 Documentation
 -------------
 
 See docs/html/index.htm for an HTML index of the major documents.
 
-See docs/changes.txt for a summary of changes to wxWindows 2.
+See docs/changes.txt for a summary of changes to wxWidgets 2.
 
 See docs/tech for an archive of technical notes.
 
-The wxWindows bug database can be browsed at:
+The wxWidgets bug database can be browsed at:
 
   http://sourceforge.net/bugs/?group_id=9863
 
@@ -195,20 +134,20 @@
 Further information
 -------------------
 
-The wxWindows Web site is located at:
+The wxWidgets Web site is located at:
 
-  http://www.wxwindows.org
+  http://www.wxwidgets.org
 
-The main wxWindows ftp site is at:
+The main wxWidgets ftp site is at:
 
   ftp://biolpc22.york.ac.uk/pub
 
-A wxWindows CD-ROM with the latest distribution plus an HTML
+A wxWidgets CD-ROM with the latest distribution plus an HTML
 front-end and hundreds of MB of compilers, utilities and other
-material may be ordered from the CD-ROM page: see the wxWindows
+material may be ordered from the CD-ROM page: see the wxWidgets
 web site.
 
 Have fun!
 
-The wxWindows Team, February 2004
+The wxWidgets Team, May 2004
 

Index: internal/wxPython-2.5/distrib/msw/tex2rtf.rsp
diff -u internal/wxPython-2.5/distrib/msw/tex2rtf.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/tex2rtf.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/tex2rtf.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tex2rtf.rsp	Wed Sep 22 14:21:02 2004
@@ -11,6 +11,7 @@
 utils/tex2rtf/src/makefile.g95
 utils/tex2rtf/src/makengui.nt
 utils/tex2rtf/src/Makefile.in
+utils/tex2rtf/src/*.bkl
 utils/tex2rtf/src/*.dsp
 utils/tex2rtf/src/*.dsw
 utils/tex2rtf/src/*.xbm

Index: internal/wxPython-2.5/docs/os2/install.txt
diff -u internal/wxPython-2.5/docs/os2/install.txt:2.1.5.1 internal/wxPython-2.5/docs/os2/install.txt:2.2
--- internal/wxPython-2.5/docs/os2/install.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/os2/install.txt	Wed Sep 22 14:21:12 2004
@@ -1,7 +1,7 @@
-Installing wxWindows 2.5.1
+Installing wxWidgets 2.5.2
 --------------------------
 
-This is wxWindows 2.5.1 for IBM OS/2 Warp3 and Warp4. This is an unstable
+This is wxWidgets 2.5.2 for IBM OS/2 Warp3 and Warp4. This is an unstable
 development release and OS/2 is considered to be in beta.
 
 IMPORTANT NOTE: If you experience problems installing, please
@@ -9,18 +9,18 @@
 readme.txt, notes on the Web site) carefully before mailing
 wx-users or the author. Preferably, try to fix the problem first and
 then send a patch to the author. Please report bugs using the
-bug report form on the wxWindows web site.
+bug report form on the wxWidgets web site.
 
 Unarchiving
 -----------
 
 At this time there is no comprehensive setup.exe type installation program.
-wxWindows for OS/2 requires you download various .zip files and unpack them
+wxWidgets for OS/2 requires you download various .zip files and unpack them
 to your desired location on your system.  Pick a location say,
-C:\wx\wxWindows-2.5.1, copy the .zip files to there and unzip them ensuring you
+C:\wx\wxWidgets-2.5.2, copy the .zip files to there and unzip them ensuring you
 unzip the subdirectories as well.  You will need:
 
-- All common, generic and OS2-specific wxWindows source;
+- All common, generic and OS2-specific wxWidgets source;
 - samples;
 - documentation in HTML Help format;
 - makefiles for VisualAge V3.0 (possibly for EMX and Watcom C++);
@@ -30,10 +30,10 @@
 - PNG library source;
 - ZLIB library source;
 
-All but the documentation is included in wxOS2-2.5.1.zip, documentation
-must be downloaded separately from the wxWindows Web site.
+All but the documentation is included in wxOS2-2.5.2.zip, documentation
+must be downloaded separately from the wxWidgets Web site.
 
-Other add-on packages are available from the wxWindows Web site, such as:
+Other add-on packages are available from the wxWidgets Web site, such as:
 
 - mmedia.zip. Audio, CD, video access for Windows and Linux.
 - ogl3.zip. Object Graphics Library: build network diagrams, CASE tools etc.
@@ -46,27 +46,27 @@
 After unzipping everything your directory tree should look something like
 this:
 
-x:\wx\wxWindows-2.5.1\docs (your HTML reference manual)
-x:\wx\wxWindows-2.5.1\include\wx
-x:\wx\wxWindows-2.5.1\include\wx\generic
-x:\wx\wxWindows-2.5.1\include\wx\html
-x:\wx\wxWindows-2.5.1\include\wx\os2
-x:\wx\wxWindows-2.5.1\samples\....  (all the sample directories)
-x:\wx\wxWindows-2.5.1\src
-x:\wx\wxWindows-2.5.1\src\common
-x:\wx\wxWindows-2.5.1\src\generic
-x:\wx\wxWindows-2.5.1\src\html
-x:\wx\wxWindows-2.5.1\src\jpeg
-x:\wx\wxWindows-2.5.1\src\os2
-x:\wx\wxWindows-2.5.1\src\png
-x:\wx\wxWindows-2.5.1\src\tiff
-x:\wx\wxWindows-2.5.1\src\zlib
+x:\wx\wxWidgets-2.5.2\docs (your HTML reference manual)
+x:\wx\wxWidgets-2.5.2\include\wx
+x:\wx\wxWidgets-2.5.2\include\wx\generic
+x:\wx\wxWidgets-2.5.2\include\wx\html
+x:\wx\wxWidgets-2.5.2\include\wx\os2
+x:\wx\wxWidgets-2.5.2\samples\....  (all the sample directories)
+x:\wx\wxWidgets-2.5.2\src
+x:\wx\wxWidgets-2.5.2\src\common
+x:\wx\wxWidgets-2.5.2\src\generic
+x:\wx\wxWidgets-2.5.2\src\html
+x:\wx\wxWidgets-2.5.2\src\jpeg
+x:\wx\wxWidgets-2.5.2\src\os2
+x:\wx\wxWidgets-2.5.2\src\png
+x:\wx\wxWidgets-2.5.2\src\tiff
+x:\wx\wxWidgets-2.5.2\src\zlib
 
 If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWindows-2.5.1\lib
+\lib directory as well, x:\wx\wxWidgets-2.5.2\lib
 and you will have to set a WXWIN environment variable in your
 config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.5.1;
+SET WXWIN=X:\WX\WXWINDOWS-2.5.2;
 
 Compilation
 -----------
@@ -84,7 +84,7 @@
 --------------------------
 
 In addition to VisualAge V3.0 Fixpack 8 you will need the following inorder
-to successfully build and use wxWindows for OS/2:
+to successfully build and use wxWidgets for OS/2:
 
 1.  IBM OS/2 Toolkit Version 4.5 or later
 2.  IBM TCPIP V4.0 or later
@@ -133,7 +133,7 @@
 both the wx23.def and the temp.def file.  Copy the header of the wx23.def to
 the clipboard and paste it into the top of the temp.def file.  If you have
 a valid SQL database client with its SDK on your system you can skip the next
-step.  wxWindows included some ODBC and SQL modules.  They expect the standard
+step.  wxWidgets included some ODBC and SQL modules.  They expect the standard
 sql.h and such to available.  If you do not have a database client with its
 SDK (such as DB/2) then for the .dll build you need to delete the exports for
 the following three modules from your temp.def file, db.cpp, dbgrid.cpp and
@@ -151,7 +151,7 @@
 the WXUSINGDLL=1 macro.  For example to build the minimal sample you would
 go to \samples\minimal and execute nmake all -f makefile.va WXUSINGDLL=1.
 
-I strongly suggest when developing apps using wxWindows for OS/2 under old
+I strongly suggest when developing apps using wxWidgets for OS/2 under old
 VisualAge 3.0, that you use the dynamically linked library. The library is
 very large and even the most trivial statically linked .exe can be very
 large and take a long time to link.  The release builds are much smaller,
@@ -171,18 +171,18 @@
 The first thing to do is to decide on a build directory. You can either
 do in-tree builds or you can do the build in a directory separated from
 the source directory. The later has the advantage, that it is much easier
-to compile and maintain several ports of wxWindows on OS/2 - if you are
+to compile and maintain several ports of wxWidgets on OS/2 - if you are
 developping cross-platform applications you might want to compile (and
 update) e.g. wxGTK or wxX11 as well.
 
 In the following, let's assume you decided to build in
-\wx\wxWindows-2.5.1\build\pm. Now we need to set some environment
+\wx\wxWidgets-2.5.2\build\pm. Now we need to set some environment
 variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
 and INSTALL (to point to the install script. If you omit this, configure
 might find something like the system's tcpip\pcomos\install.exe which will
 not do the thing you want), e.g.
 SET MAKESHELL=ash
-SET INSTALL=/wx/wxWindows-2.5.1/install-sh -c
+SET INSTALL=/wx/wxWidgets-2.5.2/install-sh -c
 
 Be warned that depending on the precise version of your make, the
 variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
@@ -191,7 +191,7 @@
 
 Now run the provided configure script by executing e.g.
 `ash -c "../../configure \
-   --prefix=directory_where_you_want_wxWindows_to_be_installed"'
+   --prefix=directory_where_you_want_wxWidgets_to_be_installed"'
 from within the build directory (the relative path might be different
 depending on the build directory you selected).
 If you are already running some unix-like shell and not cmd, you may
@@ -207,15 +207,15 @@
 prefer to change into the directory of a specific sample
 (e.g. samples\minimal) and call make there to just build this one example.
 Essentially, each sample that's not working indicates an area, where help
-in porting wxWindows to OS/2 would be appreciated.
+in porting wxWidgets to OS/2 would be appreciated.
 
-Finally, you can run `make install' which should install wxWindows to
+Finally, you can run `make install' which should install wxWidgets to
 the desired place.
 Note that we also install the wx-config script which wants to help you
 compiling your own applications, e.g. `wx-config --cxxflags` will emit the
-flags that are needed for compiling source code which includes wxWindows
+flags that are needed for compiling source code which includes wxWidgets
 headers, `wx-config --libs` will emit the flags needed for linking against
-wxWindows (wx-config is assuming you are calling it from a unix-like shell!).
+wxWidgets (wx-config is assuming you are calling it from a unix-like shell!).
 
 For building a DLL, the only supported way currently is to first build the
 static library and then use Andrew Zabolotny's dllar.cmd. However, this
@@ -225,7 +225,7 @@
 essentially have to use the procedure described above, the only difference
 being that you have to pass a switch to configure indicating which port
 to build. If you do not do this in a separate build directory (e.g.
-\wxWindows-2.5.1\build\gtk), you'll have to do a `make clean' first.
+\wxWidgets-2.5.2\build\gtk), you'll have to do a `make clean' first.
 The magical switches that have to be passed to configure for the various
 ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
 and --disable-gui (wxBase). Note that contrary to the native, PM based

Index: internal/wxPython-2.5/docs/gtk/changes.txt
diff -u internal/wxPython-2.5/docs/gtk/changes.txt:2.1.5.1 internal/wxPython-2.5/docs/gtk/changes.txt:2.2
--- internal/wxPython-2.5/docs/gtk/changes.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/gtk/changes.txt	Wed Sep 22 14:21:06 2004
@@ -1,5 +1,5 @@
 
-*** wxWindows 2.3.3 ***
+*** wxWidgets 2.3.3 ***
 
 Look at the General changes file for more encompassing on
 the changes that have taken place in 2.3.3. This file has
@@ -78,13 +78,13 @@
 Reworked wxConfig class interface.
 
 Reworked wxDynamicLibary class for loading classes (particularly
-wxWindows classes) from dynamic libraries.
+wxWidgets classes) from dynamic libraries.
 
 Removed wxObjectStream class.
 
 Further improvements to wxFileName class.
 
-*** wxWindows 2.3.2 ***
+*** wxWidgets 2.3.2 ***
 
 Addition of wxFileName class to handler DOS, Unix, Mac and VMS filenames
 and paths in a platform independent way.
@@ -92,7 +92,7 @@
 Addition of a wxPopupWindow class to imitate temporary windows such
 as those used combo boxes or in tool tips.
 
-Addition of wxToggleButton which was missing in wxWindows 2.2.
+Addition of wxToggleButton which was missing in wxWidgets 2.2.
 
 Support for virtual lists in wxListCtrl.
 
@@ -122,15 +122,15 @@
 Improved wxSizer-based layout system for better support for dynamic
 layout.
 
-*** wxWindows 2.3.0 ***
+*** wxWidgets 2.3.0 ***
 
 scaling for map modes other than wxMM_TEXT works correctly (Derry Bryson)
 
-*** wxWindows 2.2.6 ***
+*** wxWidgets 2.2.6 ***
 
 wxGauge now supports wxGA_VERTICAL (Shane Forsythe)
 
-*** 29th January 2001: wxWindows 2.2.5 released ***
+*** 29th January 2001: wxWidgets 2.2.5 released ***
 
 Synchronized with wxMSW 2.2.5, include macros
 for upwards 2.4.0 compatibility.
@@ -140,7 +140,7 @@
 Fixed compilation with --enable-no_rtti/no_exceptions
 with older egcs.
 
-*** 15th January 2001: wxWindows 2.2.4 released ***
+*** 15th January 2001: wxWidgets 2.2.4 released ***
 
 Corrected wxYield() to handle recursive calls
 more gracefully (and with a warning in debug mode).
@@ -172,7 +172,7 @@
 
 Synchronized release with wxMSW again.
 
-*** 3rd November: wxWindows 2.2.3 released ***
+*** 3rd November: wxWidgets 2.2.3 released ***
 
 Fixed bugs in HTTP code.
 
@@ -199,7 +199,7 @@
 Linux and FreeBSD default to using GS fonts (and not
 Adobe fonts).
 
-*** 20th September: wxWindows 2.2.2 released ***
+*** 20th September: wxWidgets 2.2.2 released ***
 
 Fixed wxSizer bug that made items with option
 flags greater than 1 report a wrong size.
@@ -217,7 +217,7 @@
 
 Other minor fixes.
 
-*** 20th August 2000: wxWindows 2.2.1 released ***
+*** 20th August 2000: wxWidgets 2.2.1 released ***
 
 Minor build fixes.
 
@@ -250,7 +250,7 @@
 
 Minor wxCommandLineParser changes.
 
-*** 10th July 2000: wxWindows 2.2.0 released ***
+*** 10th July 2000: wxWidgets 2.2.0 released ***
 
 Added code for writing BMP images.
 
@@ -281,7 +281,7 @@
 
 Bug-fixes.
 
-*** 4th June 2000: wxWindows pre-2.2 release ***
+*** 4th June 2000: wxWidgets pre-2.2 release ***
 
 Complete freeze now. Only vital bug-fixes allowed.
 
@@ -293,12 +293,12 @@
 
 MANY bugfixes.
 
-*** 22th March 2000: wxWindows 2.1.15 released ***
+*** 22th March 2000: wxWidgets 2.1.15 released ***
 
 Build fix. RPMs no longer require GTK's include files.
 
 An extra library for the OpenGl class now gets built
-*** 19th March 2000: wxWindows 2.1.14 released ***
+*** 19th March 2000: wxWidgets 2.1.14 released ***
 
 An extra library for the OpenGl class now gets built
 and installed. There is also an extra RPM for this
@@ -359,7 +359,7 @@
 The L-GPL iODBC library must now be enables explicitly so as
 to not mislead people into reading the license wrong.
 
-*** 24th January '2000: wxWindows 2.1.13 released ***
+*** 24th January '2000: wxWidgets 2.1.13 released ***
 
 Corrections to TAB handling in notebooks.
 
@@ -404,7 +404,7 @@
 
 Build-fixes for various platforms and compilers.
 
-*** 6th January '2000: wxWindows 2.1.12 released ***
+*** 6th January '2000: wxWidgets 2.1.12 released ***
 
 Who has a BigEndian computer (e.g. Sparc or PowerPC) that runs a 15
 and/or 16 bit colour mode? I need this for testing purposes, i.e. this
@@ -515,7 +515,7 @@
 
 Began work on a new dialog and resource editor (wxDesigner).
 
-*** 7st November '99: wxWindows 2.1.11 released ***
+*** 7st November '99: wxWidgets 2.1.11 released ***
 
 There is still an unresolved problem with bitmap to image
 conversion on big-endian architectures (such as Solaris),
@@ -524,14 +524,14 @@
 
 Enlightenment has struck the majority of the developers and
 they have chosen to use the Linux kernel numbering scheme
-for wxWindows from now on. This means that the next stable
-release will be called wxWindows 2.2.X, development snapshots
+for wxWidgets from now on. This means that the next stable
+release will be called wxWidgets 2.2.X, development snapshots
 will be called 2.1.X.
 
 A lot of discussion has been wasted on how to maintain a
 once released stable version. It was almost universally
 agreed that only a commercial entity will have the motivation
-($$$) to do that - so far there is no wxWindows Inc.
+($$$) to do that - so far there is no wxWidgets Inc.
 
 Support for GTK 1.0 has been dropped. This version has
 been tested with GTK 1.2.3 and GTK 1.2.6 - it might
@@ -553,7 +553,7 @@
 with immediate success. Actually, when using GNU compilers,
 your chances are quite good.
 
-My rewrite of the wxWindows underlying GTK widget
+My rewrite of the wxWidgets underlying GTK widget
 has turned scrolling including subwindows from barely
 functional to pretty and fast. I also added scrolling
 of foreign windows to wxScrolledWindow.
@@ -573,7 +573,7 @@
 Several printing things fixed. More work needs to be done
 here..
 
-HTML widget and the wxWindows' help system based upon
+HTML widget and the wxWidgets' help system based upon
 it have been reorganized and improved for easier use
 from Python and C++. Also HTML printing has been added.
 
@@ -588,14 +588,14 @@
 
 Michael is writing a complete rewrite of the antiquated
 wxGrid. This is still work-in-progress and might not make
-it into wxWindows 2.2, we'll see. Help would be welcome
+it into wxWidgets 2.2, we'll see. Help would be welcome
 to make that happen.
 
 Made wxMenu code lose less memory, also added wxMenu::Delete().
 
 Added code to send wxActivateEvent to MDI windows.
 
-Vadim added configure things to compile wxWindows without any
+Vadim added configure things to compile wxWidgets without any
 GUI library. This is probably work in progress. He'll also add
 a wxFontEnumerator class and has enhanced wxFont to make use
 of char-encodings.
@@ -823,7 +823,7 @@
 another cursor misbehaviour.
 
 Updated many parts of the documentation to reflect changes
-in wxWindows 2.1, wxPython and more exact description of
+in wxWidgets 2.1, wxPython and more exact description of
 cross-platform issues as well as platform differences.
 
 Many other fixes, mainly by others...
@@ -935,7 +935,7 @@
 handling and scroll event intercepting from wxScrolledWindow.
 
 By and large much of the code has stabilized and won't be much
-*** different in the final wxWindows 2.1 release. Please test as ***
+*** different in the final wxWidgets 2.1 release. Please test as ***
 much as you can.
 
 The next release will have a new build system.
@@ -981,7 +981,7 @@
 to call usleep()) in idle time - giving more CPU slices to
 the application if desired.
 
-wxGLCanvas (the OpenGl for wxWindows) now accepts keyboard input.
+wxGLCanvas (the OpenGl for wxWidgets) now accepts keyboard input.
 
 The usual number of compile and bug fixes from all involved.
 
@@ -1026,7 +1026,7 @@
 12th April '99: First wxGTK 2.1 snapshot released
 
 
-This is the first developers' version of wxWindows 2.1 for GTK. It's main
+This is the first developers' version of wxWidgets 2.1 for GTK. It's main
 new feature is that it supports GTK 1.2 (as opposed to GTK 1.0) which
 will make development within the GNOME environment a lot easier.
 
@@ -1062,16 +1062,16 @@
 
 
 
-*** 5th March '99: wxWindows 2.0 released ***
+*** 5th March '99: wxWidgets 2.0 released ***
 
 
-This is the final version of wxWindows 2.0 for GTK. The versions for
+This is the final version of wxWidgets 2.0 for GTK. The versions for
 Windows and Motif (and also this version) are available form Julian Smart's
 site. The Mac version is still under development.
 
 
 
-*** 19th February '99: wxWindows 2.0 beta 5 ***
+*** 19th February '99: wxWidgets 2.0 beta 5 ***
 
 
 This is the fifth beta release and it contains mostly bug fixes and
@@ -1081,7 +1081,7 @@
 
 
 
-*** 12th February '99: wxWindows 2.0 beta 4 ***
+*** 12th February '99: wxWidgets 2.0 beta 4 ***
 
 
 This is the fourth beta release and it contains mostly bug fixes and
@@ -1100,7 +1100,7 @@
 
 
 
-*** 29th January '99: wxWindows 2.0 beta 3 ***
+*** 29th January '99: wxWidgets 2.0 beta 3 ***
 
 
 This is the third beta release and it contains mostly bug fixes.
@@ -1109,7 +1109,7 @@
 it Drag'n'Drop. This is mostly due to the fact that DnD in
 GTK 1.0 is hardly usable and much different from GTK 1.2 which means that
 we have to design a common API for Windows, GTK 1.0 and GTK 1.2. Although
-we are trying to prevent that, it is possible that wxWindows 2.0 (being
+we are trying to prevent that, it is possible that wxWidgets 2.0 (being
 based on GTK 1.0) will not have proper DnD support.
 
 The major changes are that tool tips have been added, threads have been completely
@@ -1141,7 +1141,7 @@
 
 
 
-*** 6th January '99: wxWindows 2.0 beta 2 ***
+*** 6th January '99: wxWidgets 2.0 beta 2 ***
 
 
 This is the second beta release and contains it mostly build and
@@ -1150,7 +1150,7 @@
 
 
 
-*** 20th December '98: wxWindows 2.0 beta 1 ***
+*** 20th December '98: wxWidgets 2.0 beta 1 ***
 
 
 This is the first beta release and we have used the time before
@@ -1164,7 +1164,7 @@
 
 We changed the name of the shared library to include the version of
 the GTK used so that no conflicts emerge with simultaneous
-versions of wxWindows for GTK 1.0 and for GTK 1.2 and so on.
+versions of wxWidgets for GTK 1.0 and for GTK 1.2 and so on.
 
 As you can see, we have not moved to GTK 1.1.X as the different
 development versions are too different and buggy to be useful. We'll
@@ -1175,7 +1175,7 @@
 Linux-x86 and egcs 1.1 on Linux-Alpha and egcs 1.0 on Sparc. This isn't
 as easy as it sounds...
 
-Available form this site are the Python bindings of wxWindows.
+Available form this site are the Python bindings of wxWidgets.
 Thanks to Robin Dunn for this tremendous contribution.
 Tkinter is dead, Java is dead, wxPython rules! That's all there is to say.
 
@@ -1217,9 +1217,9 @@
 constructors.
 
 As the number of users and the number of test programs and samples
-is steadily rising the core classes of wxWindows for MSW and GTK 1.0
+is steadily rising the core classes of wxWidgets for MSW and GTK 1.0
 can be considered to be very stable if not outright bug-free. I haven't
-seen a crash for weeks now and wxWindows' internal debug features also
+seen a crash for weeks now and wxWidgets' internal debug features also
 have improved every week, making stepping-through with a debugger almost
 completely unnecessary as the library reports possible errors itself
 (when in debug mode).

Index: internal/wxPython-2.5/distrib/msw/makewinceproj.sh
diff -u /dev/null internal/wxPython-2.5/distrib/msw/makewinceproj.sh:2.1
--- /dev/null	Wed Sep 22 14:21:20 2004
+++ internal/wxPython-2.5/distrib/msw/makewinceproj.sh	Wed Sep 22 14:21:02 2004
@@ -0,0 +1,136 @@
+PATH="/c/Program Files/Bakefile/src":$PATH
+cd $WXWIN
+mkdir -p build/wince
+echo "<?xml version=\"1.0\"?><bakefile-gen><enable-formats>msevc4prj</enable-formats></bakefile-gen>" > build/bakefiles/Bakefiles.local.bkgen
+cd build/bakefiles
+echo $PATH
+bakefile_gen -b wx.bkl -f msevc4prj
+
+bakefile_gen -b ../../demos/bombs/bombs.bkl -f msevc4prj
+bakefile_gen -b ../../demos/dbbrowse/dbbrowse.bkl -f msevc4prj
+bakefile_gen -b ../../demos/forty/forty.bkl -f msevc4prj
+bakefile_gen -b ../../demos/fractal/fractal.bkl -f msevc4prj
+bakefile_gen -b ../../demos/life/life.bkl -f msevc4prj
+bakefile_gen -b ../../demos/poem/poem.bkl -f msevc4prj
+
+bakefile_gen -b ../../samples/access/access.bkl -f msevc4prj
+bakefile_gen -b ../../samples/artprov/artprov.bkl -f msevc4prj
+bakefile_gen -b ../../samples/calendar/calendar.bkl -f msevc4prj
+bakefile_gen -b ../../samples/caret/caret.bkl -f msevc4prj
+bakefile_gen -b ../../samples/checklst/checklst.bkl -f msevc4prj
+bakefile_gen -b ../../samples/config/config.bkl -f msevc4prj
+bakefile_gen -b ../../samples/console/console.bkl -f msevc4prj
+bakefile_gen -b ../../samples/controls/controls.bkl -f msevc4prj
+bakefile_gen -b ../../samples/db/db.bkl -f msevc4prj
+bakefile_gen -b ../../samples/dialogs/dialogs.bkl -f msevc4prj
+bakefile_gen -b ../../samples/dialup/dialup.bkl -f msevc4prj
+bakefile_gen -b ../../samples/display/display.bkl -f msevc4prj
+bakefile_gen -b ../../samples/dnd/dnd.bkl -f msevc4prj
+bakefile_gen -b ../../samples/docview/docview.bkl -f msevc4prj
+bakefile_gen -b ../../samples/docvwmdi/docvwmdi.bkl -f msevc4prj
+bakefile_gen -b ../../samples/dragimag/dragimag.bkl -f msevc4prj
+bakefile_gen -b ../../samples/drawing/drawing.bkl -f msevc4prj
+bakefile_gen -b ../../samples/dynamic/dynamic.bkl -f msevc4prj
+bakefile_gen -b ../../samples/erase/erase.bkl -f msevc4prj
+bakefile_gen -b ../../samples/event/event.bkl -f msevc4prj
+bakefile_gen -b ../../samples/except/except.bkl -f msevc4prj
+bakefile_gen -b ../../samples/exec/exec.bkl -f msevc4prj
+bakefile_gen -b ../../samples/font/font.bkl -f msevc4prj
+bakefile_gen -b ../../samples/grid/grid.bkl -f msevc4prj
+bakefile_gen -b ../../samples/help/help.bkl -f msevc4prj
+bakefile_gen -b ../../samples/htlbox/htlbox.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/about/about.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/help/help.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/helpview/helpview.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/html_samples.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/htmlctrl/htmlctrl.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/printing/printing.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/test/test.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/virtual/virtual.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/widget/widget.bkl -f msevc4prj
+bakefile_gen -b ../../samples/html/zip/zip.bkl -f msevc4prj
+bakefile_gen -b ../../samples/image/image.bkl -f msevc4prj
+bakefile_gen -b ../../samples/internat/internat.bkl -f msevc4prj
+bakefile_gen -b ../../samples/ipc/ipc.bkl -f msevc4prj
+bakefile_gen -b ../../samples/joytest/joytest.bkl -f msevc4prj
+bakefile_gen -b ../../samples/keyboard/keyboard.bkl -f msevc4prj
+bakefile_gen -b ../../samples/layout/layout.bkl -f msevc4prj
+bakefile_gen -b ../../samples/listbox/listbox.bkl -f msevc4prj
+bakefile_gen -b ../../samples/listctrl/listctrl.bkl -f msevc4prj
+bakefile_gen -b ../../samples/mdi/mdi.bkl -f msevc4prj
+bakefile_gen -b ../../samples/memcheck/memcheck.bkl -f msevc4prj
+bakefile_gen -b ../../samples/menu/menu.bkl -f msevc4prj
+bakefile_gen -b ../../samples/mfc/mfc.bkl -f msevc4prj
+bakefile_gen -b ../../samples/minifram/minifram.bkl -f msevc4prj
+bakefile_gen -b ../../samples/minimal/minimal.bkl -f msevc4prj
+bakefile_gen -b ../../samples/mobile/mobile_samples.bkl -f msevc4prj
+bakefile_gen -b ../../samples/mobile/styles/styles.bkl -f msevc4prj
+bakefile_gen -b ../../samples/mobile/wxedit/wxedit.bkl -f msevc4prj
+bakefile_gen -b ../../samples/multimon/multimon.bkl -f msevc4prj
+bakefile_gen -b ../../samples/nativdlg/nativdlg.bkl -f msevc4prj
+bakefile_gen -b ../../samples/notebook/notebook.bkl -f msevc4prj
+bakefile_gen -b ../../samples/oleauto/oleauto.bkl -f msevc4prj
+bakefile_gen -b ../../samples/opengl/cube/cube.bkl -f msevc4prj
+bakefile_gen -b ../../samples/opengl/isosurf/isosurf.bkl -f msevc4prj
+bakefile_gen -b ../../samples/opengl/opengl_samples.bkl -f msevc4prj
+bakefile_gen -b ../../samples/opengl/penguin/penguin.bkl -f msevc4prj
+bakefile_gen -b ../../samples/ownerdrw/ownerdrw.bkl -f msevc4prj
+bakefile_gen -b ../../samples/png/png.bkl -f msevc4prj
+bakefile_gen -b ../../samples/printing/printing.bkl -f msevc4prj
+bakefile_gen -b ../../samples/propsize/propsize.bkl -f msevc4prj
+bakefile_gen -b ../../samples/regtest/regtest.bkl -f msevc4prj
+bakefile_gen -b ../../samples/render/render.bkl -f msevc4prj
+bakefile_gen -b ../../samples/richedit/richedit.bkl -f msevc4prj
+bakefile_gen -b ../../samples/rotate/rotate.bkl -f msevc4prj
+bakefile_gen -b ../../samples/rttitest/minimal.bkl -f msevc4prj
+bakefile_gen -b ../../samples/sashtest/sashtest.bkl -f msevc4prj
+bakefile_gen -b ../../samples/scroll/scroll.bkl -f msevc4prj
+bakefile_gen -b ../../samples/scrollsub/scrollsub.bkl -f msevc4prj
+bakefile_gen -b ../../samples/shaped/shaped.bkl -f msevc4prj
+bakefile_gen -b ../../samples/sockets/sockets.bkl -f msevc4prj
+bakefile_gen -b ../../samples/sound/sound.bkl -f msevc4prj
+bakefile_gen -b ../../samples/splash/splash.bkl -f msevc4prj
+bakefile_gen -b ../../samples/splitter/splitter.bkl -f msevc4prj
+bakefile_gen -b ../../samples/statbar/statbar.bkl -f msevc4prj
+bakefile_gen -b ../../samples/tab/tab.bkl -f msevc4prj
+bakefile_gen -b ../../samples/taskbar/taskbar.bkl -f msevc4prj
+bakefile_gen -b ../../samples/text/text.bkl -f msevc4prj
+bakefile_gen -b ../../samples/thread/thread.bkl -f msevc4prj
+bakefile_gen -b ../../samples/toolbar/toolbar.bkl -f msevc4prj
+bakefile_gen -b ../../samples/treectrl/treectrl.bkl -f msevc4prj
+bakefile_gen -b ../../samples/typetest/typetest.bkl -f msevc4prj
+bakefile_gen -b ../../samples/validate/validate.bkl -f msevc4prj
+bakefile_gen -b ../../samples/vscroll/vscroll.bkl -f msevc4prj
+bakefile_gen -b ../../samples/widgets/widgets.bkl -f msevc4prj
+bakefile_gen -b ../../samples/wizard/wizard.bkl -f msevc4prj
+
+bakefile_gen -b ../../contrib/build/animate/animate.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/deprecated/deprecated.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/fl/fl.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/gizmos/gizmos.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/mmedia/mmedia.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/net/net.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/ogl/ogl.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/plot/plot.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/stc/stc.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/svg/svg.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/build/xrc/xrc.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/animate/anitest.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/deprecated/proplist/proplist.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/deprecated/resource/resource.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/deprecated/treelay/treelay.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/fl/fl.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/dynsash/dynsash.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/editlbox/editlbox.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/led/led.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/multicell/multicell.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/gizmos/splittree/splittree.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/mmedia/mmboard.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/ogl/ogledit/ogledit.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/ogl/studio/studio.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/plot/plot.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/stc/stctest.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/svg/svgtest.bkl -f msevc4prj
+bakefile_gen -b ../../contrib/samples/xrc/xrcdemo.bkl -f msevc4prj
+

Index: internal/wxPython-2.5/docs/motif/install.txt
diff -u internal/wxPython-2.5/docs/motif/install.txt:2.1.5.1 internal/wxPython-2.5/docs/motif/install.txt:2.2
--- internal/wxPython-2.5/docs/motif/install.txt:2.1.5.1	Thu Apr  8 18:15:19 2004
+++ internal/wxPython-2.5/docs/motif/install.txt	Wed Sep 22 14:21:10 2004
@@ -1,4 +1,4 @@
-wxWindows 2.5 for Motif installation
+wxWidgets 2.5 for Motif installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -9,9 +9,9 @@
   mailing wx-users or the author. Preferably, try to fix the
   problem first and then send a patch to the author.
   
-  When sending bug reports tell us what version of wxWindows you are 
+  When sending bug reports tell us what version of wxWidgets you are 
   using (including the beta) and what compiler on what system. One 
-  example: wxMotif 2.5.1, gcc 2.95.4, Redhat 6.1
+  example: wxMotif 2.5.2, gcc 2.95.4, Redhat 6.1
 
 First steps
 -----------
@@ -22,7 +22,7 @@
 - Download wxX11-x.y.z.tgz, where x.y.z is the version number.
   (wxMotif is included in the wxX11 distribution).
   Download documentation in a preferred format, such as
-  wxWindows-HTML.zip or wxWindows-PDF.zip.
+  wxWidgets-HTML.zip or wxWidgets-PDF.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
   directory.
@@ -30,9 +30,9 @@
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles. You also need
   libXpm (see comments in the Notes section below) if you want to have
-  XPM support in wxWindows (recommended).
+  XPM support in wxWidgets (recommended).
 
-- You can now use configure to build wxWindows and the samples.
+- You can now use configure to build wxWidgets and the samples.
 
   Using configure is the only way to build the library. If it doesn't
   work for you for whatever reason, please report it (together with detailed
@@ -46,7 +46,7 @@
 * The simplest case
 -------------------
 
-If you compile wxWindows on Linux for the first time and don't like to read 
+If you compile wxWidgets on Linux for the first time and don't like to read 
 install instructions just do (in the base dir):
 
 > ./configure --with-motif
@@ -64,7 +64,7 @@
 > ldconfig
 > exit
 
-If you want to remove wxWindows on Unix you can do this:
+If you want to remove wxWidgets on Unix you can do this:
 
 > su <type root password>
 > make uninstall
@@ -74,10 +74,10 @@
 * The expert case
 -----------------
 
-If you want to do some more serious cross-platform programming with wxWindows, 
+If you want to do some more serious cross-platform programming with wxWidgets, 
 such as for GTK and Motif, you can now build two complete libraries and use 
 them concurrently. For this end, you have to create a directory for each build 
-of wxWindows - you may also want to create different versions of wxWindows
+of wxWidgets - you may also want to create different versions of wxWidgets
 and test them concurrently. Most typically, this would be a version configured 
 with --enable-debug and one without. Note, that only one build can
 currently be installed, so you'd have to use local version of the library for
@@ -126,12 +126,12 @@
 * General
 ---------
 
-The Unix variants of wxWindows use GNU configure. If you have problems with
+The Unix variants of wxWidgets use GNU configure. If you have problems with
 your make use GNU make instead.
 
-If you have general problems with installation, see the wxWindows website at 
+If you have general problems with installation, see the wxWidgets website at 
 
-  http://www.wxwindows.org/
+  http://www.wxwidgets.org/
   
 for newest information. If you still don't have any success, please send a bug 
 report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
@@ -142,7 +142,7 @@
 * GUI libraries
 ---------------
 
-wxWindows/Motif requires the Motif library to be installed on your system. As
+wxWidgets/Motif requires the Motif library to be installed on your system. As
 an alternative, you may also use the free library "lesstif" which implements
 most of the Motif API without the licence restrictions of Motif.
 
@@ -153,7 +153,7 @@
 * Additional libraries
 ----------------------
 
-wxWindows/Motif requires a thread library and X libraries known to work with
+wxWidgets/Motif requires a thread library and X libraries known to work with
 threads.  This is the case on all commercial Unix-Variants and all
 Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
 many aspects. As of writing this, virtually all Linux distributions have
@@ -173,7 +173,7 @@
 
 Please send comments and question about the OS/2 installation
 to Stefan Neis <Stefan.Neis at t-online.de> and patches to
-the wxWindows mailing list.
+the wxWidgets mailing list.
 
 In the following list, the version numbers indicate the configuration that
 was actually used by myself, newer version should cause no problems and
@@ -268,7 +268,7 @@
 are enabled by default.
 
 Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
+in wxWidgets snapshot 6, but not yet all (ODBC not).
 
 You have to add --with-motif on platforms, where Motif is
 not the default (on Linux, configure will default to GTK).
@@ -284,9 +284,9 @@
 
 	--disable-shared        Do not create shared libraries.
 
-    --enable-monolithic     Build wxWindows as single library instead
+    --enable-monolithic     Build wxWidgets as single library instead
                             of as several smaller libraries (which is
-                            the default since wxWindows 2.5.0).
+                            the default since wxWidgets 2.5.0).
 
 	--disable-optimise      Do not optimise the code. Can
 	                        sometimes be useful for debugging
@@ -329,7 +329,7 @@
 				such as gdb (or its many frontends).
 
 	--enable-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
-	                        compiling. This enable wxWindows' very
+	                        compiling. This enable wxWidgets' very
 				useful internal debugging tricks (such
 				as automatically reporting illegal calls)
 				to work. Note that program and library
@@ -340,11 +340,11 @@
 -----------------
 
 Many of the configure options have been thoroughly tested
-in wxWindows snapshot 6, but not yet all (ODBC not).
+in wxWidgets snapshot 6, but not yet all (ODBC not).
 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
-drastically reduced by removing features from wxWindows that 
+drastically reduced by removing features from wxWidgets that 
 are not used in your program. The most relevant such features
 are
 
@@ -412,7 +412,7 @@
 
         make install	
 
-You can remove any traces of wxWindows by typing
+You can remove any traces of wxWidgets by typing
 
         make uninstall
 	
@@ -448,14 +448,14 @@
 This is certain to become the standard way unless we decide
 to stick to tmake.
 
-If your application uses only some of wxWindows libraries, you can
+If your application uses only some of wxWidgets libraries, you can
 specify required libraries when running wx-config. For example,
 `wx-config --libs=html,core` will only output link command to link
 with libraries required by core GUI classes and wxHTML classes. See
 the manual for more information on the libraries.
 
 2) The other way creates a project within the source code 
-directories of wxWindows. For this endeavour, you'll need
+directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
@@ -472,7 +472,7 @@
   # makewxmotif
   # Sets permissions (in case we extracted wxMotif from zip files)
   # and makes wxMotif.
-  # Call from top-level wxWindows directory.
+  # Call from top-level wxWidgets directory.
   # Note that this uses standard (but commonly-used) configure options;
   # if you're feeling brave, you may wish to compile with threads:
   # if they're not supported by the target platform, they will be disabled
@@ -484,7 +484,7 @@
   -------:x-----Cut here-----:x-----
 
   This script will build wxMotif using shared libraries. If you want to build
-  a static wxWindows library, use --disable-shared.
+  a static wxWidgets library, use --disable-shared.
 
 Troubleshooting
 ---------------

Index: internal/wxPython-2.5/docs/toback24.txt
diff -u internal/wxPython-2.5/docs/toback24.txt:2.1.5.1 internal/wxPython-2.5/docs/toback24.txt:2.2
--- internal/wxPython-2.5/docs/toback24.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/toback24.txt	Wed Sep 22 14:21:04 2004
@@ -6,9 +6,9 @@
 
 2. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2
 
-CVS: [RR] wxWindows/src/gtk dcclient.cpp,1.162,1.163 font.cpp,1.69,1.70 window.cpp,1.411,1.412
-CVS: [RR] wxWindows/src/gtk choice.cpp,1.55,1.56 combobox.cpp,1.87,1.88
-CVS: [RR] wxWindows/src/gtk minifram.cpp,1.29,1.30
+CVS: [RR] wxWidgets/src/gtk dcclient.cpp,1.162,1.163 font.cpp,1.69,1.70 window.cpp,1.411,1.412
+CVS: [RR] wxWidgets/src/gtk choice.cpp,1.55,1.56 combobox.cpp,1.87,1.88
+CVS: [RR] wxWidgets/src/gtk minifram.cpp,1.29,1.30
    (not sure about minifram.cpp: must be checked for binary compatibility - VS)
 
 When applying, be careful to not pick later revision of font.cpp -- 2.5 doesn't
@@ -17,14 +17,14 @@
 
 3. Add Windows XP manifests to wx.rc
 
-RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.manifest,v
+RCS file: /pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.manifest,v
 done
 Checking in wx.manifest;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.manifest,v  <--  wx.manifest
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.manifest,v  <--  wx.manifest
 initial revision: 1.1
 done
 Checking in wx.rc;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.rc,v  <--  wx.rc
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.rc,v  <--  wx.rc
 new revision: 1.29; previous revision: 1.28
 done
 
@@ -33,10 +33,10 @@
 http://sf.net/tracker/index.php?func=detail&aid=718913&group_id=9863&atid=309863
 
 Checking in include/wx/containr.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/containr.h,v  <--  containr.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/containr.h,v  <--  containr.h
 new revision: 1.10; previous revision: 1.9
 Checking in src/common/containr.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/containr.cpp,v  <--  containr.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/containr.cpp,v  <--  containr.cpp
 new revision: 1.17; previous revision: 1.16
 
 6. fixes for user dash wxPens handling
@@ -44,19 +44,19 @@
 http://sf.net/tracker/index.php?func=detail&aid=717736&group_id=9863&atid=309863
 
 Checking in include/wx/msw/pen.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/pen.h,v  <--  pen.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/pen.h,v  <--  pen.h
 new revision: 1.16; previous revision: 1.15
 Checking in src/msw/pen.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/pen.cpp,v  <--  pen.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/pen.cpp,v  <--  pen.cpp
 new revision: 1.20; previous revision: 1.19
 Checking in src/gtk/pen.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/gtk/pen.cpp,v  <--  pen.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/pen.cpp,v  <--  pen.cpp
 new revision: 1.23; previous revision: 1.22
 Checking in samples/drawing/drawing.cpp;
-/pack/cvsroots/wxwindows/wxWindows/samples/drawing/drawing.cpp,v  <--  drawing.cpp
+/pack/cvsroots/wxwindows/wxWidgets/samples/drawing/drawing.cpp,v  <--  drawing.cpp
 new revision: 1.67; previous revision: 1.66
 Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v  <--  changes.txt
+/pack/cvsroots/wxwindows/wxWidgets/docs/changes.txt,v  <--  changes.txt
 new revision: 1.266; previous revision: 1.265
 
 8. UnixWare compilation fixes:
@@ -64,22 +64,22 @@
 Don't forget to rerun autoconf to regenerate configure!
 
 Checking in configure.in;
-/pack/cvsroots/wxwindows/wxWindows/configure.in,v  <--  configure.in
+/pack/cvsroots/wxwindows/wxWidgets/configure.in,v  <--  configure.in
 new revision: 1.664; previous revision: 1.663
 Checking in setup.h.in;
-/pack/cvsroots/wxwindows/wxWindows/setup.h.in,v  <--  setup.h.in
+/pack/cvsroots/wxwindows/wxWidgets/setup.h.in,v  <--  setup.h.in
 new revision: 1.111; previous revision: 1.110
 Checking in src/unix/gsocket.c;
-/pack/cvsroots/wxwindows/wxWindows/src/unix/gsocket.c,v  <--  gsocket.c
+/pack/cvsroots/wxwindows/wxWidgets/src/unix/gsocket.c,v  <--  gsocket.c
 new revision: 1.72; previous revision: 1.71
 
 9. wxSemaphore methods returned incorrect values:
 
 Checking in src/msw/thread.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/thread.cpp,v  <--  thread.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/thread.cpp,v  <--  thread.cpp
 new revision: 1.62; previous revision: 1.61
 Checking in src/unix/threadpsx.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/unix/threadpsx.cpp,v  <--  threadpsx.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/unix/threadpsx.cpp,v  <--  threadpsx.cpp
 new revision: 1.62; previous revision: 1.61
 
 10. Unix/OpenGL build fix:
@@ -87,7 +87,7 @@
 Don't forget to rerun autoconf to regenerate configure!
 
 Checking in configure.in;
-/pack/cvsroots/wxwindows/wxWindows/configure.in,v  <--  configure.in
+/pack/cvsroots/wxwindows/wxWidgets/configure.in,v  <--  configure.in
 new revision: 1.666; previous revision: 1.665
 
 11. Ukrainian translation (locale/uk.po)
@@ -99,7 +99,7 @@
 http://sf.net/tracker/index.php?func=detail&aid=720542&group_id=9863&atid=309863
 
 Checking in src/msw/fdrepdlg.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/fdrepdlg.cpp,v  <--  fdrepdlg.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/fdrepdlg.cpp,v  <--  fdrepdlg.cpp
 new revision: 1.10; previous revision: 1.9
 
 
@@ -108,11 +108,11 @@
 http://sf.net/tracker/index.php?func=detail&aid=728768&group_id=9863&atid=309863
 
 Checking in include/wx/gtk/dcmemory.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/gtk/dcmemory.h,v  <--  dcmemory.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/gtk/dcmemory.h,v  <--  dcmemory.h
 new revision: 1.13; previous revision: 1.12
 done
 Checking in src/gtk/dcmemory.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/gtk/dcmemory.cpp,v  <--  dcmemory.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/dcmemory.cpp,v  <--  dcmemory.cpp
 new revision: 1.21; previous revision: 1.20
 done
 
@@ -122,7 +122,7 @@
 http://sf.net/tracker/index.php?func=detail&aid=626048&group_id=9863&atid=309863
 
 Checking in src/gtk/menu.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/gtk/menu.cpp,v  <--  menu.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/menu.cpp,v  <--  menu.cpp
 new revision: 1.136; previous revision: 1.135
 
 
@@ -131,7 +131,7 @@
 http://sf.net/tracker/index.php?func=detail&aid=736208&group_id=9863&atid=109863
 
 Checking in include/wx/textbuf.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/textbuf.h,v  <--  textbuf.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/textbuf.h,v  <--  textbuf.h
 new revision: 1.8; previous revision: 1.7
 
 
@@ -140,22 +140,22 @@
 http://sf.net/tracker/?func=detail&aid=215436&group_id=9863&atid=109863
 
 Checking in src/common/containr.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/containr.cpp,v  <--  containr.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/containr.cpp,v  <--  containr.cpp
 new revision: 1.18; previous revision: 1.17
 
 
 21. Fix wxGTK w/ GTK+2 to respect wxDC::SetBackgroundMode and SetTextBackground
 
 Checking in dcclient.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/gtk/dcclient.cpp,v  <--  dcclient.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/dcclient.cpp,v  <--  dcclient.cpp
 new revision: 1.170; previous revision: 1.169
 done
 
 
 22. patch [ 619705 ] Fixes wxApp::GetComCtl32Version
 
-Checking in wxWindows/src/msw/app.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/app.cpp,v  <--  app.cpp
+Checking in wxWidgets/src/msw/app.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/app.cpp,v  <--  app.cpp
 new revision: 1.186; previous revision: 1.185
 done
 
@@ -169,29 +169,29 @@
 See: Bug [ 744199 ] wxBringWindowToTop, child window z-order
 
 Checking in include/wx/msw/dialog.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/dialog.h,v  <--  dialog.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/dialog.h,v  <--  dialog.h
 new revision: 1.34; previous revision: 1.33
 done
 Checking in src/msw/dialog.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/dialog.cpp,v  <--  dialog.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/dialog.cpp,v  <--  dialog.cpp
 new revision: 1.84; previous revision: 1.83
 done
 Checking in src/msw/window.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/window.cpp,v  <--  window.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v  <--  window.cpp
 new revision: 1.381; previous revision: 1.380
 done
 
 25. wxGenericListCtrl::Refresh() (didn't work at all before)
 
 Checking in include//wx/generic/listctrl.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/generic/listctrl.h,v  <--  listctrl.h
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/generic/listctrl.h,v  <--  listctrl.h
 new revision: 1.77; previous revision: 1.76
 Checking in src/generic/listctrl.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/generic/listctrl.cpp,v  <--  listctrl.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/generic/listctrl.cpp,v  <--  listctrl.cpp
 new revision: 1.284; previous revision: 1.283
-cvs diff: [13:19:09] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/include/wx/generic
+cvs diff: [13:19:09] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWidgets/include/wx/generic
 Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v  <--  changes.txt
+/pack/cvsroots/wxwindows/wxWidgets/docs/changes.txt,v  <--  changes.txt
 new revision: 1.299; previous revision: 1.298
 
 
@@ -200,42 +200,42 @@
 evenly among all of them.
 
 Checking in sizer.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/sizer.cpp,v  <--  sizer.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/sizer.cpp,v  <--  sizer.cpp
 new revision: 1.71; previous revision: 1.70
 
 28. patch [ 771772 ] Crashes when setting icon tooltip longer than 63 characters
 
 Checking in window.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/window.cpp,v  <--  window.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v  <--  window.cpp
 new revision: 1.431; previous revision: 1.430
 
 29. Fix infinite loop in IsDialoMessage when a panel is reparented after
     creation (as happens with XRC)
 Checking in src/msw/window.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/window.cpp,v  <--  window.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v  <--  window.cpp
 new revision: 1.432; previous revision: 1.431
 
 30. Fix enumerating groups/entries in wxRegConfig under '/':
 
 Checking in src/msw/regconf.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/regconf.cpp,v  <--  regconf.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/regconf.cpp,v  <--  regconf.cpp
 new revision: 1.48; previous revision: 1.47
 
 31. Cleanup of ZIP charset conversion in Unicode build
 
 Checking in fs_zip.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/fs_zip.cpp,v  <--  fs_zip.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/fs_zip.cpp,v  <--  fs_zip.cpp
 new revision: 1.27; previous revision: 1.26
 done
 Checking in zipstrm.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/zipstrm.cpp,v  <--  zipstrm.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/zipstrm.cpp,v  <--  zipstrm.cpp
 new revision: 1.10; previous revision: 1.9
 done
 
 32. Apply patch [ 866387 ] wxGenericDirCtrl does not accept multiple wildcards
 
 Checking in src/generic/dirctrlg.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/generic/dirctrlg.cpp,v  <--  dirctrlg.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/generic/dirctrlg.cpp,v  <--  dirctrlg.cpp
 new revision: 1.81; previous revision: 1.80
 
 33. Apply patch [ 873021 ] Bug fix for MSW wxComboBox
@@ -245,36 +245,36 @@
 wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection.
 
 Checking in src/msw/combobox.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/combobox.cpp,v  <--  combobox.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/combobox.cpp,v  <--  combobox.cpp
 new revision: 1.72; previous revision: 1.71
 done
 
 34. Apply patch [ 851052 ] [msw] Clipboard: Allow automatic format conversionsChecking in clipbrd.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/clipbrd.cpp,v  <--  clipbrd.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/clipbrd.cpp,v  <--  clipbrd.cpp
 new revision: 1.54; previous revision: 1.53
 done
 
 35. [ 882201 ] wxXPMDecoder doesn't always patch magenta
 
 Checking in xpmdecod.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/xpmdecod.cpp,v  <--  xpmdecod.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/common/xpmdecod.cpp,v  <--  xpmdecod.cpp
 new revision: 1.32; previous revision: 1.31
 done
 
 36. [ 892580, 892582 ] Fix of variable declaration in wxApp::Yield().
 
 Checking in src/motif/app.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/motif/app.cpp,v  <--  app.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/motif/app.cpp,v  <--  app.cpp
 new revision: 1.82; previous revision: 1.81
 done
 Checking in src/x11/app.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/x11/app.cpp,v  <--  app.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/x11/app.cpp,v  <--  app.cpp
 new revision: 1.94; previous revision: 1.93
 done
 
 37. no-remap system option, and tool centring
 Checking in src/msw/tbar95.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/tbar95.cpp,v  <--  tbar95.cpp
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/tbar95.cpp,v  <--  tbar95.cpp
 new revision: 1.121; previous revision: 1.120
 done
 
@@ -306,6 +306,12 @@
 new revision: 1.26; previous revision: 1.25
 done
 
+39. Fix for files opened by another app in wxFileName::GetModificationTime():
+
+Checking in src/common/filename.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/filename.cpp,v  <--  filename.cpp
+new revision: 1.131; previous revision: 1.130
+
 =======
 
 

Index: internal/wxPython-2.5/docs/msw/install.txt
diff -u internal/wxPython-2.5/docs/msw/install.txt:2.1.5.1 internal/wxPython-2.5/docs/msw/install.txt:2.2
--- internal/wxPython-2.5/docs/msw/install.txt:2.1.5.1	Thu Apr  8 18:15:20 2004
+++ internal/wxPython-2.5/docs/msw/install.txt	Wed Sep 22 14:21:11 2004
@@ -1,7 +1,7 @@
-Installing wxWindows 2.5.1
+Installing wxWidgets 2.5.2
 --------------------------
 
-This is wxWindows 2.5.1 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
+This is wxWidgets 2.5.2 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
 and Windows XP. This is an unstable development release. Note that unstable in
 this context doesn't mean that it crashes a lot, just that the library API may
 change in backwards incompatible way during the 2.5 branch lifetime.
@@ -27,7 +27,7 @@
 
 The setup program contains the following:
 
-- All common, generic and MSW-specific wxWindows source;
+- All common, generic and MSW-specific wxWidgets source;
 - samples and demos;
 - documentation in MS HTML Help format;
 - makefiles for most Windows compilers, plus CodeWarrior,
@@ -47,12 +47,12 @@
 
 If installing from the CVS server, copy include/wx/msw/setup0.h to
 include/wx/msw/setup.h and edit the resulting file to choose
-the features you would like to compile wxWindows with[out].
+the features you would like to compile wxWidgets with[out].
 
 Compilation
 ===========
 
-The following sections explain how to compile wxWindows with each supported
+The following sections explain how to compile wxWidgets with each supported
 compiler. Search for one of Microsoft/Borland/Watcom/Symantec/Metrowerks/
 Cygwin/Mingw32 to quickly locate the instructions for your compiler.
 
@@ -70,10 +70,10 @@
   lib\bcc_lib                   Static libraries for Borland C++
   lib\wat_dll                   Watcom C++ DLLs
 
-Names of compiled wxWindows libraries follow this scheme: libraries that don't
+Names of compiled wxWidgets libraries follow this scheme: libraries that don't
 depend on GUI components begin with "wxbase" followed by version number and
 letters indicating if the library is compiled as Unicode ('u') and/or debug
-build ('d'). Last component of them name is name of wxWindows component
+build ('d'). Last component of them name is name of wxWidgets component
 (unless you built the library as single monolithic library; look for
 "Configuring the build" below). This is a typical set of release ANSI build
 libraries (release versions on left, debug on right side):
@@ -120,7 +120,7 @@
 
 Using project files (VC++ 6 and later):
 
-1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 6 project
+1. Unarchive wxWidgets-x.y.z-vc.zip, the VC++ 6 project
    makefiles (already included in wxMSW-x.y.z.zip and the setup version).
 2. Open build\msw\wx.dsw, which has configurations for static
    compilation or DLL compilation, and each of these available in
@@ -149,7 +149,7 @@
 
   'nmake -f makefile.vc'
 
-   to make the wxWindows core library as release DLL.
+   to make the wxWidgets core library as release DLL.
    See "Configuring the build" for instruction how to build debug or static
    libraries.
 
@@ -167,7 +167,7 @@
 the headers. Alternatively, #undef new before including template headers.
 You will also need to set wxUSE_IOSTREAMH to 0 if you will be
 using templates, to avoid the non-template stream files being included
-within wxWindows.
+within wxWidgets.
 
 Note (2): libraries and applications generated with makefiles and
 project files are now (hopefully) compatible where static libraries
@@ -182,7 +182,7 @@
 the project. After this, delete everything (including PCH) and recompile.
 
 Note (4): to create your own IDE files, copy .dsp and .dsw
-files from an existing wxWindows sample and adapt them, or
+files from an existing wxWidgets sample and adapt them, or
 visit http://wiki.wxwindows.org/wiki.pl?MSVC.
 
 Borland C++ 5.0/5.5 compilation
@@ -191,14 +191,14 @@
 Compiling using the makefiles (updated 24 Sept 02):
 
 1. Change directory to build\msw. Type 'make -f makefile.bcc' to
-   make the wxWindows core library. Ignore the compiler warnings.
+   make the wxWidgets core library. Ignore the compiler warnings.
    This produces a couple of libraries in the lib\bcc_lib directory.
 
 2. Change directory to a sample or demo such as samples\minimal, and type
   'make -f makefile.bcc'. This produces a windows exe file - by default 
    in the bcc_mswd subdirectory.
 
-Note (1): the wxWindows makefiles assume dword structure alignment. Please
+Note (1): the wxWidgets makefiles assume dword structure alignment. Please
 make sure that your own project or makefile settings use the
 same alignment, or you could experience mysterious crashes. To
 change the alignment, change CPPFLAGS in build\msw\config.bcc.
@@ -206,7 +206,7 @@
 Note (2): if you get undefined _SQL... symbols at link time,
 either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
 directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
-recompile wxWindows. The same applies if compiling using the IDE.
+recompile wxWidgets. The same applies if compiling using the IDE.
 
 Note (3): If you wish debug messages to be sent to the console in
 debug mode, edit makefile.bcc and change /aa to /Tpe in link commands.
@@ -219,7 +219,7 @@
 
 ** REMEMBER **
 
-In all of your wxWindows applications, your source code should include
+In all of your wxWidgets applications, your source code should include
 the following preprocessor directive:
 
 #ifdef __BORLANDC__
@@ -232,14 +232,14 @@
 Borland 16 Bit compilation for Windows 3.1
 ------------------------------------------
 
-The last version of wxWindows to support 16-bit compilation with Borland was
+The last version of wxWidgets to support 16-bit compilation with Borland was
 2.2.7 - Please download and read the instructions in that release
 
 Watcom C++ 10.6/11 and OpenWatcom compilation
 ---------------------------------------------
 
 1. Change directory to build\msw. Type 'wmake -f makefile.wat' to
-   make the wxWindows core library.
+   make the wxWidgets core library.
 
 2. Change directory to samples\minimal and type 'wmake -f makefile.wat'
    to make this sample. Repeat for other samples of interest.
@@ -263,7 +263,7 @@
 ----------------------------------
 
 1. CodeWarrior Pro7 project files in XML format are already
-   included in wxMSW-2.5.1.zip and the setup version.
+   included in wxMSW-2.5.2.zip and the setup version.
 
 2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
    you are working from the CVS version) to make sure the settings reflect
@@ -274,7 +274,7 @@
          will be rather confusing due to interactions with the MSL ANSI
          and runtime libs.
 
-3. The project file to build the Win32 wxWindows libraries relies on the
+3. The project file to build the Win32 wxWidgets libraries relies on the
    Batch File Runner plug-in.  This plug-in is not installed as part of
    a normal CW7 installation.  However, you can find this plug-in on the
    CodeWarrior Reference CD, in the Thrill Seekers folder; it's call the
@@ -289,7 +289,7 @@
           include\wx\msw\setup.h (or include\wx\msw\setup0.h if you are
           working from the CVS version) to lib\cw7mswd\include\wx\setup.h
 
-5. Import src\wxWindowsW7.xml to create the project file wxWindowsW7.mcp.
+5. Import src\wxWidgetsW7.xml to create the project file wxWidgetsW7.mcp.
    Store this project file in directory src.  You may get warnings about
    not being able to find certain project paths; ignore these warnings, the
    appropriate paths will be created during the build by the Batch File Runner.
@@ -326,7 +326,7 @@
 Cygwin/MinGW compilation
 ------------------------
 
-wxWindows 2 supports Cygwin (formerly GnuWin32) betas and
+wxWidgets 2 supports Cygwin (formerly GnuWin32) betas and
 releases, and MinGW. Cygwin can be downloaded from:
 
     http://sources.redhat.com/cygwin/
@@ -338,35 +338,38 @@
 Both Cygwin and MinGW can be used with configure (assuming you have MSYS
 installed in case of MinGW). You will need new enough MinGW version, preferably
 MinGW 2.0 (ships with gcc3) or at least 1.0 (gcc-2.95.3). GCC versions older
-than 2.95.3 don't work; you can use wxWindows 2.4 with them.
+than 2.95.3 don't work; you can use wxWidgets 2.4 with them.
 
 NOTE: some notes specific to old Cygwin (< 1.1.x) are at the end of this
       section (see OLD VERSIONS)
 
-There are two methods of compiling wxWindows, by using the
+There are two methods of compiling wxWidgets, by using the
 makefiles provided or by using 'configure'.
 
 Retrieve and install the latest version of Cygwin, or MinGW, as per
 the instructions with either of these packages.
 
 If using MinGW, you can download the add-on MSYS package to
-provide Unix-like tools that you'll need to build wxWindows using configure.
+provide Unix-like tools that you'll need to build wxWidgets using configure.
 
 Using makefiles directly
 ------------------------
 
-NOTE: The makefile are for compilation under Cygwin, or
-      command.com/cmd.exe, they won't work in other environments
-      (such as UNIX or Unix-like, e.g. MSYS, you have to use configure
-      instead)
+NOTE: The makefile.gcc makefiles are for compilation under MinGW using
+      native make and Windows command interpreter (command.com/cmd.exe), they
+      won't work in other environments (such as UNIX or Unix-like, e.g. MSYS;
+      you have to use configure instead)
 
 Here are the steps required using the provided makefiles:
 
 - If you are using gcc-2.95, edit build\msw\config.gcc and set the GCC_VERSION
   variable to "2.95".
 
-- Use the makefile.gcc files for compiling wxWindows and samples,
-  e.g. to compile a debugging version of wxWindows:
+- If you are compiling with GCC 3.x using makefiles and with wxUSE_STL == 1
+  you need to manually add -DNO_GCC_PRAGMA to CXXFLAGS in config.gcc.
+
+- Use the makefile.gcc files for compiling wxWidgets and samples,
+  e.g. to compile a debugging version of wxWidgets:
   > cd c:\wx\build\msw
   > make -f makefile.gcc BUILD=debug
   > cd c:\wx\samples\minimal
@@ -388,7 +391,7 @@
 system to generate appropriate makefiles, as used on Unix
 and Mac OS X systems.
 
-Change directory to the root of the wxWindows distribution,
+Change directory to the root of the wxWidgets distribution,
 make a build directory, and run configure and make in this directory.
 
 For example:
@@ -406,7 +409,7 @@
 Notes:
 
 1. See also the Cygwin/MinGW on the web site or CD-ROM for
-   further information about using wxWindows with these compilers.
+   further information about using wxWidgets with these compilers.
 
 2. libwx.a is 100 MB or more - but much less if compiled with no
    debug info (-g0) and level 4 optimization (-O4).
@@ -449,7 +452,7 @@
    as follows:
 
    /usr/local/lib - wxmswXYZd.dll.a and wxmswXYZd.dll
-   /usr/local/include/wx - wxWindows header files
+   /usr/local/include/wx - wxWidgets header files
    /usr/local/bin - wx-config
 
    You may need to do this if using wx-config with the
@@ -468,7 +471,7 @@
 
 - For Cygwin, make sure there's a \tmp directory on your
   Windows drive or bison will crash (actually you don't need
-  bison for ordinary wxWindows compilation: a pre-generated .c file is
+  bison for ordinary wxWidgets compilation: a pre-generated .c file is
   supplied).
 
 - If using GnuWin32 b18, you will need to copy windres.exe
@@ -487,7 +490,7 @@
    from http://www.digitalmars.com/download/freecompiler.html
 
 2. Change directory to build\msw and type 'make -f makefile.dmc' to
-   make the wxWindows core library.
+   make the wxWidgets core library.
 
 3. Change directory to samples\minimal and type 'make -f makefile.dmc'
    to make this sample. Most of the other samples also work.
@@ -506,7 +509,7 @@
 Configuring the build
 =====================
 
-So far the instructions only explained how to build release DLLs of wxWindows
+So far the instructions only explained how to build release DLLs of wxWidgets
 and did not cover any configuration. It is possible to change many aspects of
 the build, including debug/release and ANSI/Unicode settings. All makefiles in
 build\msw directory use same options (with a few exceptions documented below)
@@ -521,7 +524,7 @@
 where $(compiler) is same extension as the makefile you use has (see below).
 The latter is good for setting options that never change in your development
 process (e.g. GCC_VERSION or VENDOR). If you want to build several versions of
-wxWindows and use them side by side, the former method is better. Settings in
+wxWidgets and use them side by side, the former method is better. Settings in
 config.* files are shared by all makefiles (samples, contrib, main library),
 but if you pass the options as arguments, you must use same arguments you used
 for the library when building samples or contrib libraries!
@@ -573,13 +576,13 @@
 
 WXUNIV=1
   Build wxUniversal instead of native wxMSW (see
-  http://www.wxwindows.org/wxuniv.htm for more information).
+  http://www.wxwidgets.org/wxuniv.htm for more information).
 
 Advanced options
 ----------------
 
 MONOLITHIC=1
-  Starting with version 2.5.1, wxWindows has the ability to be built as 
+  Starting with version 2.5.1, wxWidgets has the ability to be built as 
   several smaller libraries instead of single big one as used to be the case
   in 2.4 and older versions. This is called "multilib build" and is the
   default behaviour of makefiles. You can still build single library
@@ -637,15 +640,15 @@
 
 VENDOR=<your company name>
   Set this to a short string identifying your company if you are planning to
-  distribute wxWindows DLLs with your application. Default value is 'custom'.
-  This string is included as part of DLL name. wxWindows DLLs contain compiler
+  distribute wxWidgets DLLs with your application. Default value is 'custom'.
+  This string is included as part of DLL name. wxWidgets DLLs contain compiler
   name, version information and vendor name in them. For example
   wxmsw250_core_bcc_custom.dll is one of DLLs build using Borland C++ with
   default settings. If you set VENDOR=mycorp, the name will change to
   wxmsw250_core_bcc_mycorp.dll.
 
 CFG=<configuration name>
-  Sets configuration name so that you can have multiple wxWindows builds with
+  Sets configuration name so that you can have multiple wxWidgets builds with
   different setup.h settings coexisting in same tree. See "Object and library
   directories" below for more information.
 

Index: internal/wxPython-2.5/distrib/msw/tardist
diff -u internal/wxPython-2.5/distrib/msw/tardist:2.1.5.1 internal/wxPython-2.5/distrib/msw/tardist:2.2
--- internal/wxPython-2.5/distrib/msw/tardist:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/tardist	Wed Sep 22 14:21:02 2004
@@ -1,9 +1,9 @@
 #!/bin/sh
-# tardist: make up a tar.gz distribution of wxWindows 2
+# tardist: make up a tar.gz distribution of wxWidgets 2
 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -45,19 +45,29 @@
 
   cp $WXSRC/docs/readme.txt $WXDEST/readme-${WXVER}.txt
   cp $WXSRC/docs/changes.txt $WXDEST/changes-${WXVER}.txt
+
   cp $WXSRC/docs/mgl/readme.txt $WXDEST/readme-mgl-${WXVER}.txt
   cp $WXSRC/docs/mgl/install.txt $WXDEST/install-mgl-${WXVER}.txt
+
   cp $WXSRC/docs/x11/readme.txt $WXDEST/readme-x11-${WXVER}.txt
-  cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
+#  cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
   cp $WXSRC/docs/x11/install.txt $WXDEST/install-x11-${WXVER}.txt
+
   cp $WXSRC/docs/motif/readme.txt $WXDEST/readme-motif-${WXVER}.txt
   cp $WXSRC/docs/motif/install.txt $WXDEST/install-motif-${WXVER}.txt
+
   cp $WXSRC/docs/msw/readme.txt $WXDEST/readme-msw-${WXVER}.txt
   cp $WXSRC/docs/msw/install.txt $WXDEST/install-msw-${WXVER}.txt
+
   cp $WXSRC/docs/gtk/readme.txt $WXDEST/readme-gtk-${WXVER}.txt
   cp $WXSRC/docs/gtk/install.txt $WXDEST/install-gtk-${WXVER}.txt
+
   cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
   cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
+
+  cp $WXSRC/docs/cocoa/readme.txt $WXDEST/readme-cocoa-${WXVER}.txt
+  cp $WXSRC/docs/cocoa/install.txt $WXDEST/install-cocoa-${WXVER}.txt
+
   cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
 
   # Make .mo files
@@ -165,7 +175,7 @@
 ### wxMac
 cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/setup.h
 cd $WXSRC
-cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
 $TAR cf $WXDEST/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
@@ -178,10 +188,10 @@
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
 $TAR xf ../wxMac-${WXVER}.tar
@@ -204,18 +214,18 @@
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
 #expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
 #
 #echo Re-tarring wxUniversal in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-Univ.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-Univ.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-Univ.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
+#rm -f wxWidgets-${WXVER}-Univ.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-Univ.tar
 
 dospinwxall()
 {
@@ -223,30 +233,30 @@
 
 ### wxAll: all distributions in one giant archive
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/wince.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt
 $TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
 
 echo Re-tarring wxAll in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
+mkdir wxWidgets-${WXVER}
 
-cd wxWindows-${WXVER}
+cd wxWidgets-${WXVER}
 
 # If we have the full set of VC++ project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-VC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-VC.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-VC.zip"
 fi
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
 $TAR xf ../wxAll-${WXVER}.tar
@@ -272,9 +282,10 @@
 
 cd ..
 rm -f wxAll-${WXVER}.tar
-$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxAll-${WXVER}.tar
+$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip -c $WXDEST/wxAll-${WXVER}.tar > $WXDEST/wxAll-${WXVER}.tar.gz
+bzip2 $WXDEST/wxAll-${WXVER}.tar
 }
 
 dospinwxdocs()
@@ -285,138 +296,138 @@
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
 #expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar -T /tmp/docsrc.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-doc.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-doc.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-doc.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
+#rm -f wxWidgets-${WXVER}-doc.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-doc.tar
 
 ### HTML docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
 expandlines /tmp/html_in.txt /tmp/html.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
 
 echo Re-tarring HTML in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTML.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTML.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTML.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
+rm -f wxWidgets-${WXVER}-HTML.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTML.tar
 
 ### HTB docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
 expandlines /tmp/htb_in.txt /tmp/htb.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
 
 echo Re-tarring HTB in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTB.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTB.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTB.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
+rm -f wxWidgets-${WXVER}-HTB.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTB.tar
 
 ### PDF docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
 expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
 
 echo Re-tarring PDF in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-PDF.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-PDF.tar
 cd ..
-rm -f wxWindows-${WXVER}-PDF.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
+rm -f wxWidgets-${WXVER}-PDF.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-PDF.tar
 }
 
 ### Tex2RTF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
 #expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
 #
 #echo Re-tarring Tex2RTF in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tex2rtf.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tex2rtf.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
+#rm -f wxWidgets-${WXVER}-tex2rtf.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar
 
 ### OGL
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
 #expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar -T /tmp/ogl.txt
 #
 #echo Re-tarring OGL in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-ogl.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-ogl.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-ogl.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
+#rm -f wxWidgets-${WXVER}-ogl.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-ogl.tar
 
 ### JPEG
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
 #expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
 #
 #echo Re-tarring jpeg in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-jpeg.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-jpeg.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
+#rm -f wxWidgets-${WXVER}-jpeg.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-jpeg.tar
 
 ### TIFF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
 #expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar -T /tmp/tiff.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tiff.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tiff.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tiff.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar
+#rm -f wxWidgets-${WXVER}-tiff.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tiff.tar
 
 init=""
 if [ "$1" = "" ]
@@ -484,7 +495,7 @@
     esac
 done
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER

Index: internal/wxPython-2.5/distrib/msw/wince.rsp
diff -u internal/wxPython-2.5/distrib/msw/wince.rsp:2.1.5.1 internal/wxPython-2.5/distrib/msw/wince.rsp:2.2
--- internal/wxPython-2.5/distrib/msw/wince.rsp:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/wince.rsp	Wed Sep 22 14:21:02 2004
@@ -1,380 +1,373 @@
-src/msw/wince/wxWindowsCE.vcp
-src/msw/wince/wxWindowsCE.vcw
+build/wince/wx.vcw
+build/wince/wx_gl.vcp
+build/wince/wx_mono.vcp
+build/wince/wx_wxexpat.vcp
+build/wince/wx_wxjpeg.vcp
+build/wince/wx_wxpng.vcp
+build/wince/wx_wxzlib.vcp
 
-src/jpeg/jpegCE.vcp
-src/jpeg/jpegCE.vcw
+samples/access/access.vcp
+samples/access/access.vcw
 
-src/tiff/tiffCE.vcp
-src/tiff/tiffCE.vcw
+samples/artprov/artprov.vcp
+samples/artprov/artprov.vcw
 
-src/zlib/zlibCE.vcp
-src/zlib/zlibCE.vcw
+samples/calendar/arttest.vcp
+samples/calendar/arttest.vcw
 
-src/png/pngCE.vcp
-src/png/pngCE.vcw
+samples/calendar/calendar.vcp
+samples/calendar/calendar.vcw
 
-src/regex/regexCE.vcp
-src/regex/regexCE.vcw
+samples/caret/caret.vcp
+samples/caret/caret.vcw
 
-samples/samplesCE.vcw
+samples/checklst/checklst.vcp
+samples/checklst/checklst.vcw
 
-samples/access/accessCE.vcp
-samples/access/accessCE.vcw
+samples/config/config.vcp
+samples/config/config.vcw
 
-samples/artprov/artprovCE.vcp
-samples/artprov/artprovCE.vcw
+samples/console/console.vcp
+samples/console/console.vcw
 
-samples/calendar/arttestCE.vcp
-samples/calendar/arttestCE.vcw
+samples/controls/controls.vcp
+samples/controls/controls.vcw
 
-samples/calendar/calendarCE.vcp
-samples/calendar/calendarCE.vcw
+samples/db/db.vcp
+samples/db/db.vcw
 
-samples/caret/caretCE.vcp
-samples/caret/caretCE.vcw
+samples/dialogs/dialogs.vcp
+samples/dialogs/dialogs.vcw
 
-samples/checklst/checklstCE.vcp
-samples/checklst/checklstCE.vcw
+samples/dialup/dialup.vcp
+samples/dialup/dialup.vcw
 
-samples/config/configCE.vcp
-samples/config/configCE.vcw
+samples/display/display.vcp
+samples/display/display.vcw
 
-samples/console/consoleCE.vcp
-samples/console/consoleCE.vcw
+samples/dnd/dnd.vcp
+samples/dnd/dnd.vcw
 
-samples/controls/controlsCE.vcp
-samples/controls/controlsCE.vcw
+samples/dragimag/dragimag.vcp
+samples/dragimag/dragimag.vcw
 
-samples/db/dbCE.vcp
-samples/db/dbCE.vcw
+samples/docview/docview.vcp
+samples/docview/docview.vcw
 
-samples/dialogs/dialogsCE.vcp
-samples/dialogs/dialogsCE.vcw
+samples/docvwmdi/docvwmdi.vcp
+samples/docvwmdi/docvwmdi.vcw
 
-samples/dialup/dialupCE.vcp
-samples/dialup/dialupCE.vcw
+samples/drawing/drawing.vcp
+samples/drawing/drawing.vcw
 
-samples/display/displayCE.vcp
-samples/display/displayCE.vcw
+samples/dynamic/dynamic.vcp
+samples/dynamic/dynamic.vcw
 
-samples/dnd/dndCE.vcp
-samples/dnd/dndCE.vcw
+samples/erase/erase.vcp
+samples/erase/erase.vcw
 
-samples/dragimag/dragimagCE.vcp
-samples/dragimag/dragimagCE.vcw
+samples/event/event.vcp
+samples/event/event.vcw
 
-samples/docview/docviewCE.vcp
-samples/docview/docviewCE.vcw
+samples/exec/exec.vcp
+samples/exec/exec.vcw
 
-samples/docvwmdi/docvwmdiCE.vcp
-samples/docvwmdi/docvwmdiCE.vcw
+samples/font/font.vcp
+samples/font/font.vcw
 
-samples/drawing/drawingCE.vcp
-samples/drawing/drawingCE.vcw
+samples/grid/grid.vcp
+samples/grid/grid.vcw
 
-samples/dynamic/dynamicCE.vcp
-samples/dynamic/dynamicCE.vcw
+samples/help/help.vcp
+samples/help/help.vcw
 
-samples/erase/eraseCE.vcp
-samples/erase/eraseCE.vcw
+samples/htlbox/htlbox.vcp
+samples/htlbox/htlbox.vcw
 
-samples/event/eventCE.vcp
-samples/event/eventCE.vcw
+samples/html/about/about.vcp
+samples/html/about/about.vcw
+samples/html/help/help.vcp
+samples/html/help/help.vcw
+samples/html/helpview/helpview.vcp
+samples/html/helpview/helpview.vcw
+samples/html/printing/printing.vcp
+samples/html/printing/printing.vcw
+samples/html/test/test.vcp
+samples/html/test/test.vcw
+samples/html/virtual/virtual.vcp
+samples/html/virtual/virtual.vcw
+samples/html/widget/widget.vcp
+samples/html/widget/widget.vcw
+samples/html/zip/zip.vcp
+samples/html/zip/zip.vcw
 
-samples/exec/execCE.vcp
-samples/exec/execCE.vcw
+samples/image/image.vcp
+samples/image/image.vcw
 
-samples/font/fontCE.vcp
-samples/font/fontCE.vcw
+samples/internat/internat.vcp
+samples/internat/internat.vcw
 
-samples/grid/griddemoCE.vcp
-samples/grid/griddemoCE.vcw
+samples/keyboard/keyboard.vcp
+samples/keyboard/keyboard.vcw
 
-samples/help/helpCE.vcp
-samples/help/helpCE.vcw
+samples/ipc/client.vcp
+samples/ipc/client.vcw
+samples/ipc/server.vcp
+samples/ipc/server.vcw
 
-samples/htlbox/htlboxCE.vcp
-samples/htlbox/htlboxCE.vcw
+samples/joytest/joytest.vcp
+samples/joytest/joytest.vcw
 
-samples/html/about/aboutCE.vcp
-samples/html/about/aboutCE.vcw
-samples/html/help/helpCE.vcp
-samples/html/help/helpCE.vcw
-samples/html/helpview/helpviewCE.vcp
-samples/html/helpview/helpviewCE.vcw
-samples/html/printing/printingCE.vcp
-samples/html/printing/printingCE.vcw
-samples/html/test/testCE.vcp
-samples/html/test/testCE.vcw
-samples/html/virtual/virtualCE.vcp
-samples/html/virtual/virtualCE.vcw
-samples/html/widget/widgetCE.vcp
-samples/html/widget/widgetCE.vcw
-samples/html/zip/zipCE.vcp
-samples/html/zip/zipCE.vcw
+samples/layout/layout.vcp
+samples/layout/layout.vcw
 
-samples/image/imageCE.vcp
-samples/image/imageCE.vcw
+samples/listbox/lboxtest.vcp
+samples/listbox/lboxtest.vcw
 
-samples/internat/internatCE.vcp
-samples/internat/internatCE.vcw
+samples/listctrl/listctrl.vcp
+samples/listctrl/listctrl.vcw
 
-samples/keyboard/keyboardCE.vcp
-samples/keyboard/keyboardCE.vcw
+samples/mdi/mdi.vcp
+samples/mdi/mdi.vcw
 
-samples/ipc/clientCE.vcp
-samples/ipc/clientCE.vcw
-samples/ipc/serverCE.vcp
-samples/ipc/serverCE.vcw
+samples/memcheck/memcheck.vcp
+samples/memcheck/memcheck.vcw
 
-samples/joytest/joytestCE.vcp
-samples/joytest/joytestCE.vcw
+samples/menu/menu.vcp
+samples/menu/menu.vcw
 
-samples/layout/layoutCE.vcp
-samples/layout/layoutCE.vcw
+samples/mfc/mfc.vcp
+samples/mfc/mfc.vcw
 
-samples/listbox/lboxtestCE.vcp
-samples/listbox/lboxtestCE.vcw
+samples/minimal/minimal.vcp
+samples/minimal/minimal.vcw
 
-samples/listctrl/listctrlCE.vcp
-samples/listctrl/listctrlCE.vcw
+samples/minifram/minifram.vcp
+samples/minifram/minifram.vcw
 
-samples/mdi/mdiCE.vcp
-samples/mdi/mdiCE.vcw
+samples/mobile/styles/styles.vcp
+samples/mobile/styles/styles.vcw
+samples/mobile/wxedit/wxedit.vcp
+samples/mobile/wxedit/wxedit.vcw
 
-samples/memcheck/memcheckCE.vcp
-samples/memcheck/memcheckCE.vcw
+samples/multimon/multimon.vcp
+samples/multimon/multimon.vcw
 
-samples/menu/menuCE.vcp
-samples/menu/menuCE.vcw
+samples/nativdlg/nativdlg.vcp
+samples/nativdlg/nativdlg.vcw
 
-samples/mfc/mfcCE.vcp
-samples/mfc/mfcCE.vcw
+samples/notebook/notebook.vcp
+samples/notebook/notebook.vcw
 
-samples/minimal/minimalCE.vcp
-samples/minimal/minimalCE.vcw
+samples/oleauto/oleauto.vcp
+samples/oleauto/oleauto.vcw
 
-samples/minifram/miniframCE.vcp
-samples/minifram/miniframCE.vcw
+samples/ownerdrw/ownerdrw.vcp
+samples/ownerdrw/ownerdrw.vcw
 
-samples/mobile/styles/stylesCE.vcp
-samples/mobile/wxedit/wxeditCE.vcw
+samples/png/png.vcp
+samples/png/png.vcw
 
-samples/multimon/multimon_testCE.vcp
-samples/multimon/multimon_testCE.vcw
+samples/printing/printing.vcp
+samples/printing/printing.vcw
 
-samples/nativdlg/nativdlgCE.vcp
-samples/nativdlg/nativdlgCE.vcw
+samples/propsize/propsize.vcp
+samples/propsize/propsize.vcw
 
-samples/notebook/notebookCE.vcp
-samples/notebook/notebookCE.vcw
+samples/regtest/regtest.vcp
+samples/regtest/regtest.vcw
 
-samples/oleauto/oleautoCE.vcp
-samples/oleauto/oleautoCE.vcw
+samples/render/render.vcp
+samples/render/render.vcw
 
-samples/ownerdrw/ownerDrwCE.vcp
-samples/ownerdrw/ownerDrwCE.vcw
+samples/rotate/rotate.vcp
+samples/rotate/rotate.vcw
 
-samples/png/pngCE.vcp
-samples/png/pngCE.vcw
+samples/sashtest/sashtest.vcp
+samples/sashtest/sashtest.vcw
 
-samples/printing/printingCE.vcp
-samples/printing/printingCE.vcw
+samples/scroll/scroll.vcp
+samples/scroll/scroll.vcw
 
-samples/propsize/propsizeCE.vcp
-samples/propsize/propsizeCE.vcw
+samples/scrollsub/scrollsub.vcp
+samples/scrollsub/scrollsub.vcw
 
-samples/regtest/regtestCE.vcp
-samples/regtest/regtestCE.vcw
+samples/shaped/shaped.vcp
+samples/shaped/shaped.vcw
 
-samples/rotate/rotateCE.vcp
-samples/rotate/rotateCE.vcw
+samples/sockets/client.vcp
+samples/sockets/server.vcp
+samples/sockets/client.vcw
+samples/sockets/server.vcw
 
-samples/sashtest/sashtestCE.vcp
-samples/sashtest/sashtestCE.vcw
+samples/splash/splash.vcp
+samples/splash/splash.vcw
 
-samples/scroll/scrollCE.vcp
-samples/scroll/scrollCE.vcw
+samples/splitter/splitter.vcp
+samples/splitter/splitter.vcw
 
-samples/scrollsub/scrollsubCE.vcp
-samples/scrollsub/scrollsubCE.vcw
+samples/statbar/statbar.vcp
+samples/statbar/statbar.vcw
 
-samples/shaped/shapedCE.vcp
-samples/shaped/shapedCE.vcw
+samples/taskbar/taskbar.vcp
+samples/taskbar/taskbar.vcw
 
-samples/sockets/clientCE.vcp
-samples/sockets/serverCE.vcp
-samples/sockets/clientCE.vcw
-samples/sockets/serverCE.vcw
+samples/text/text.vcp
+samples/text/text.vcw
 
-samples/splitter/splitterCE.vcp
-samples/splitter/splitterCE.vcw
+samples/thread/thread.vcp
+samples/thread/thread.vcw
 
-samples/statbar/statbarCE.vcp
-samples/statbar/statbarCE.vcw
+samples/toolbar/toolbar.vcp
+samples/toolbar/toolbar.vcw
 
-samples/taskbar/taskbarCE.vcp
-samples/taskbar/taskbarCE.vcw
+samples/treectrl/treetest.vcp
+samples/treectrl/treetest.vcw
 
-samples/text/textCE.vcp
-samples/text/textCE.vcw
+samples/typetest/typetest.vcp
+samples/typetest/typetest.vcw
 
-samples/thread/threadCE.vcp
-samples/thread/threadCE.vcw
+samples/validate/validate.vcp
+samples/validate/validate.vcw
 
-samples/toolbar/toolbarCE.vcp
-samples/toolbar/toolbarCE.vcw
+samples/vscroll/vscroll.vcp
+samples/vscroll/vscroll.vcw
 
-samples/treectrl/treetestCE.vcp
-samples/treectrl/treetestCE.vcw
+samples/wizard/wizard.vcp
+samples/wizard/wizard.vcw
 
-samples/typetest/typetestCE.vcp
-samples/typetest/typetestCE.vcw
+samples/widgets/widgets.vcp
+samples/widgets/widgets.vcw
 
-samples/validate/validateCE.vcp
-samples/validate/validateCE.vcw
+samples/opengl/cube/cube.vcp
+samples/opengl/cube/cube.vcw
+samples/opengl/isosurf/isosurf.vcp
+samples/opengl/isosurf/isosurf.vcw
+samples/opengl/penguin/penguin.vcp
+samples/opengl/penguin/penguin.vcw
 
-samples/vscroll/vscrollCE.vcp
-samples/vscroll/vscrollCE.vcw
+demos/bombs/bombs.vcp
+demos/bombs/bombs.vcw
 
-samples/wizard/wizardCE.vcp
-samples/wizard/wizardCE.vcw
+demos/dbbrowse/dbbrowse.vcp
+demos/dbbrowse/dbbrowse.vcw
 
-samples/wxtest/wxtestCE.vcp
-samples/wxtest/wxtestCE.vcw
+demos/forty/forty.vcp
+demos/forty/forty.vcw
 
-samples/widgets/widgetsCE.vcp
-samples/widgets/widgetsCE.vcw
+demos/fractal/fractal.vcp
+demos/fractal/fractal.vcw
 
-samples/opengl/cube/cubeCE.vcp
-samples/opengl/cube/cubeCE.vcw
-samples/opengl/isosurf/isosurfCE.vcp
-samples/opengl/isosurf/isosurfCE.vcw
-samples/opengl/penguin/penguinCE.vcp
-samples/opengl/penguin/penguinCE.vcw
+demos/life/life.vcp
+demos/life/life.vcw
 
-demos/bombs/bombsCE.vcp
-demos/bombs/bombsCE.vcw
+demos/poem/poem.vcp
+demos/poem/poem.vcw
 
-demos/dbbrowse/dbbrowseCE.vcp
-demos/dbbrowse/dbbrowseCE.vcw
+utils/tex2rtf/src/Tex2RTF.vcp
+utils/tex2rtf/src/Tex2RTF.vcw
 
-demos/forty/fortyCE.vcp
-demos/forty/fortyCE.vcw
+utils/hhp2cached/hhp2cached.vcp
+utils/hhp2cached/hhp2cached.vcw
 
-demos/fractal/fractalCE.vcp
-demos/fractal/fractalCE.vcw
+utils/helpgen/src/HelpGen.vcp
+utils/helpgen/src/HelpGen.vcw
 
-demos/life/lifeCE.vcp
-demos/life/lifeCE.vcw
+utils/helpview/src/helpview.vcp
+utils/helpview/src/helpview.vcw
+utils/helpview/src/client.vcp
+utils/helpview/src/client.vcw
 
-demos/poem/poemCE.vcp
-demos/poem/poemCE.vcw
+contrib/src/ogl/Ogl.vcp
+contrib/src/ogl/Ogl.vcw
 
-utils/tex2rtf/src/Tex2RTFCE.vcp
-utils/tex2rtf/src/Tex2RTFCE.vcw
+contrib/samples/ogl/ogledit/Ogledit.vcp
+contrib/samples/ogl/ogledit/Ogledit.vcw
+contrib/samples/ogl/studio/Studio.vcp
+contrib/samples/ogl/studio/Studio.vcw
 
-utils/hhp2cached/hhp2cachedCE.vcp
-utils/hhp2cached/hhp2cachedCE.vcw
+contrib/src/xrc/Xrc.vcp
+contrib/src/xrc/Xrc.vcw
 
-utils/helpgen/src/HelpGenCE.vcp
-utils/helpgen/src/HelpGenCE.vcw
+contrib/samples/xrc/XrcDemo.vcp
+contrib/samples/xrc/XrcDemo.vcw
 
-utils/helpview/src/helpviewCE.vcp
-utils/helpview/src/helpviewCE.vcw
-utils/helpview/src/clientCE.vcp
-utils/helpview/src/clientCE.vcw
+contrib/src/mmedia/Mmedia.vcp
+contrib/src/mmedia/MMedia.vcw
 
-contrib/src/ogl/OglCE.vcp
-contrib/src/ogl/OglCE.vcw
+contrib/samples/mmedia/Mmboard.vcp
+contrib/samples/mmedia/Mmboard.vcw
 
-contrib/samples/ogl/ogledit/OgleditCE.vcp
-contrib/samples/ogl/ogledit/OgleditCE.vcw
-contrib/samples/ogl/studio/StudioCE.vcp
-contrib/samples/ogl/studio/StudioCE.vcw
+contrib/src/stc/Stc.vcp
+contrib/src/stc/Stc.vcw
 
-contrib/src/xrc/XrcCE.vcp
-contrib/src/xrc/XrcCE.vcw
+contrib/samples/stc/StcTest.vcp
+contrib/samples/stc/StcTest.vcw
 
-contrib/samples/xrc/XrcDemoCE.vcp
-contrib/samples/xrc/XrcDemoCE.vcw
+contrib/utils/wxrc/wxrc.vcp
+contrib/utils/wxrc/wxrc.vcw
 
-contrib/src/mmedia/MmediaCE.vcp
-contrib/src/mmedia/MMediaCE.vcw
+contrib/utils/convertrc/Convert.vcp
+contrib/utils/convertrc/Convert.vcw
 
-contrib/samples/mmedia/MmboardCE.vcp
-contrib/samples/mmedia/MmboardCE.vcw
+contrib/utils/wxrcedit/wxRcEdit.vcp
+contrib/utils/wxrcedit/wxRcEdit.vcw
 
-contrib/src/stc/StcCE.vcp
-contrib/src/stc/StcCE.vcw
+contrib/src/canvas/Canvas.vcp
+contrib/src/canvas/Canvas.vcw
+contrib/samples/canvas/simple/Simple.vcp
+contrib/samples/canvas/simple/Simple.vcw
+contrib/samples/canvas/test/Test.vcp
+contrib/samples/canvas/test/Test.vcw
 
-contrib/samples/stc/StcTestCE.vcp
-contrib/samples/stc/StcTestCE.vcw
+contrib/src/plot/Plot.vcp
+contrib/src/plot/Plot.vcw
+contrib/samples/plot/Plot.vcp
+contrib/samples/plot/Plot.vcw
 
-contrib/utils/wxrc/wxrcCE.vcp
-contrib/utils/wxrc/wxrcCE.vcw
+contrib/src/gizmos/Gizmos.vcp
+contrib/src/gizmos/Gizmos.vcw
+contrib/samples/gizmos/dynsash/dynsash.vcp
+contrib/samples/gizmos/dynsash/dynsash.vcw
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcw
+contrib/samples/gizmos/editlbox/editlbox.vcp
+contrib/samples/gizmos/editlbox/editlbox.vcw
+contrib/samples/gizmos/multicell/multicell.vcp
+contrib/samples/gizmos/multicell/multicell.vcw
+contrib/samples/gizmos/splittree/Tree.vcp
+contrib/samples/gizmos/splittree/Tree.vcw
 
-contrib/utils/convertrc/ConvertCE.vcp
-contrib/utils/convertrc/ConvertCE.vcw
+contrib/src/animate/Animate.vcp
+contrib/src/animate/Animate.vcw
+contrib/samples/animate/AniTest.vcp
+contrib/samples/animate/AniTest.vcw
 
-contrib/utils/wxrcedit/wxRcEditCE.vcp
-contrib/utils/wxrcedit/wxRcEditCE.vcw
+contrib/src/fl/fl.vcp
+contrib/src/fl/fl.vcw
+contrib/samples/fl/fl_demo1/fl_demo.vcp
+contrib/samples/fl/fl_demo1/fl_demo.vcw
+contrib/samples/fl/fl_demo2/fl_demo.vcp
+contrib/samples/fl/fl_demo2/fl_demo.vcw
+contrib/samples/fl/fl_sample1/fl_demo.vcp
+contrib/samples/fl/fl_sample1/fl_demo.vcw
+contrib/samples/fl/fl_sample2/fl_demo.vcp
+contrib/samples/fl/fl_sample2/fl_demo.vcw
+contrib/samples/fl/fl_sample3/fl_demo.vcp
+contrib/samples/fl/fl_sample3/fl_demo.vcw
 
-contrib/src/canvas/CanvasCE.vcp
-contrib/src/canvas/CanvasCE.vcw
-contrib/samples/canvas/simple/SimpleCE.vcp
-contrib/samples/canvas/simple/SimpleCE.vcw
-contrib/samples/canvas/test/TestCE.vcp
-contrib/samples/canvas/test/TestCE.vcw
+contrib/src/net/Net.vcp
+contrib/src/net/Net.vcw
 
-contrib/src/plot/PlotCE.vcp
-contrib/src/plot/PlotCE.vcw
-contrib/samples/plot/PlotCE.vcp
-contrib/samples/plot/PlotCE.vcw
+contrib/src/deprecated/deprecated.vcp
 
-contrib/src/gizmos/GizmosCE.vcp
-contrib/src/gizmos/GizmosCE.vcw
-contrib/samples/gizmos/dynsash/dynsashCE.vcp
-contrib/samples/gizmos/dynsash/dynsashCE.vcw
-contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcp
-contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcw
-contrib/samples/gizmos/editlbox/editlboxCE.vcp
-contrib/samples/gizmos/editlbox/editlboxCE.vcw
-contrib/samples/gizmos/multicell/multicellCE.vcp
-contrib/samples/gizmos/multicell/multicellCE.vcw
-contrib/samples/gizmos/splittree/TreeCE.vcp
-contrib/samples/gizmos/splittree/TreeCE.vcw
+contrib/samples/deprecated/proplist/proplist.vcp
+contrib/samples/deprecated/proplist/proplist.vcw
 
-contrib/src/animate/AnimateCE.vcp
-contrib/src/animate/AnimateCE.vcw
-contrib/samples/animate/AniTestCE.vcp
-contrib/samples/animate/AniTestCE.vcw
+contrib/samples/deprecated/resource/resource.vcp
+contrib/samples/deprecated/resource/resource.vcw
 
-contrib/src/fl/flCE.vcp
-contrib/src/fl/flCE.vcw
-contrib/samples/fl/fl_demo1/fl_demoCE.vcp
-contrib/samples/fl/fl_demo1/fl_demoCE.vcw
-contrib/samples/fl/fl_demo2/fl_demoCE.vcp
-contrib/samples/fl/fl_demo2/fl_demoCE.vcw
-contrib/samples/fl/fl_sample1/fl_demoCE.vcp
-contrib/samples/fl/fl_sample1/fl_demoCE.vcw
-contrib/samples/fl/fl_sample2/fl_demoCE.vcp
-contrib/samples/fl/fl_sample2/fl_demoCE.vcw
-contrib/samples/fl/fl_sample3/fl_demoCE.vcp
-contrib/samples/fl/fl_sample3/fl_demoCE.vcw
-
-contrib/src/net/NetCE.vcp
-contrib/src/net/NetCE.vcw
-
-contrib/src/deprecated/deprecatedCE.vcp
-
-contrib/samples/deprecated/proplist/proplistCE.vcp
-contrib/samples/deprecated/proplist/proplistCE.vcw
-
-contrib/samples/deprecated/resource/resourceCE.vcp
-contrib/samples/deprecated/resource/resourceCE.vcw
-
-contrib/samples/deprecated/treelay/treelayCE.vcp
-contrib/samples/deprecated/treelay/treelayCE.vcw
+contrib/samples/deprecated/treelay/treelay.vcp
+contrib/samples/deprecated/treelay/treelay.vcw
 
 

Index: internal/wxPython-2.5/docs/changes.txt
diff -u internal/wxPython-2.5/docs/changes.txt:2.1.5.1 internal/wxPython-2.5/docs/changes.txt:2.2
--- internal/wxPython-2.5/docs/changes.txt:2.1.5.1	Thu Apr  8 18:15:17 2004
+++ internal/wxPython-2.5/docs/changes.txt	Wed Sep 22 14:21:04 2004
@@ -1,6 +1,6 @@
-----------------------------
-wxWindows 2.5/2.6 Change Log
-----------------------------
+------------------------
+wxWidgets 2.5 Change Log
+------------------------
 
 INCOMPATIBLE CHANGES SINCE 2.4.x
 ================================
@@ -14,9 +14,96 @@
     series.
 
 ! windows are no longer fully repainted when resized, use new style
-  wxFULL_REPAINT_ON_RESIZE to force this (wxNO_FULL_REPAINT_ON_RESIZE stll
+  wxFULL_REPAINT_ON_RESIZE to force this (wxNO_FULL_REPAINT_ON_RESIZE still
   exists but doesn't do anything any more, this behaviour is default now)
 
+! wxWindow::m_font and m_backgroundColour/m_foregroundColour are no longer
+  always set, use GetFont(), GetBack/ForegroundColour() to access
+  them, and they will be dynamically determined if necessary.
+
+
+! The Sizers have had some fundamental internal changes in the 2.5.2
+  and 2.5.3 releases intended to make them do more of the "Right
+  Thing" but also be as backwards compatible as possible.  First a bit
+  about how things used to work:
+
+    * The size that a window had when Add()ed to the sizer was assumed
+      to be its minimal size, and that size would always be used by
+      default when calculating layout size and positions, and the
+      sizer itself would keep track of that minimal size.
+
+    * If the window item was Add()ed with the wxADJUST_MINSIZE flag
+      then when layout was calculated the item's GetBestSize would be
+      used to reset the minimal size that the sizer used.
+
+  The main thrust of the new Sizer changes was to make behaviour like
+  wxADJUST_MINSIZE be the default, and also to push the tracking of
+  the minimal size to the window itself (since it knows its own needs)
+  instead of having the sizer take care of it.  Consequently these
+  changes were made:
+
+    * The wxFIXED_MINSIZE flag was added to allow for the old
+      behaviour.  When this flag is used the size a window has when
+      Add()ed to the sizer will be treated as its minimal size and it
+      will not be readjusted on each layout.
+
+    * The min size stored in wxWindow and settable with SetSizeHints or
+      SetMinSize will by default be used by the sizer (if it was set)
+      as the minimal size of the sizer item.  If the minsize was not
+      set (or was only partially set) then the window's best size is
+      fetched and it is used instead of (or blended with) the minsize.
+      wxWindow:GetBestFittingSize was added to facilitate getting the
+      size to be used by the sizers.
+
+    * The best size of a window is cached so it doesn't need to
+      recaculated on every layout.  wxWindow::InvalidateBestSize was
+      added and should be called (usually just internally in control
+      methods) whenever something is done that would make the best
+      size change.
+
+    * All wxControls were changed to set the minsize to what is passed
+      to the constructor or Create method, and also to set the real
+      size of the control to the blending of the minsize and bestsize.
+      wxWindow::SetBestFittingSize was added to help with this,
+      although most controls don't need to call it directly because it
+      is called indirectly via the SetInitialSize called in the base
+      classes.
+
+  At this time, the only situation known not to work the same as
+  before is the following:
+
+	 win = new SomeWidget(parent);
+	 win->SetSize(SomeNonDefaultSize);
+	 sizer->Add(win);
+
+  In this case the old code would have used the new size as the
+  minimum, but now the sizer will use the default size as the minimum
+  rather than the size set later.  It is an easy fix though, just move
+  the specification of the size to the constructor (assuming that
+  SomeWidget will set its minsize there like the rest of the controls
+  do) or call SetMinSize instead of SetSize.
+
+  In order to fit well with this new scheme of things, all wxControls
+  or custom controls should do the following things.  (Depending on
+  how they are used you may also want to do the same thing for
+  non-control custom windows.)
+
+    * Either override or inherit a meaningful DoGetBestSize method
+      that calculates whatever size is "best" for the control.  Once
+      that size is calculated then there should normally be a call to
+      CacheBestSize to save it for later use, unless for some reason
+      you want the best size to be recalculated on every layout.
+
+    * Any method that changes the attributes of the control such that
+      the best size will change should call InvalidateBestSize so it
+      will be recalculated the next time it is needed.
+
+    * The control's constructor and/or Create method should ensure
+      that the minsize is set to the size passed in, and that the
+      control is sized to a blending of the min size and best size.
+      This can be done by calling SetBestFittingSize.
+
+
 
 - no initialization/cleanup can be done in wxApp/~wxApp because they are
   now called much earlier/later than before; please move any exiting code
@@ -42,15 +129,34 @@
 - wxTaskBarIcon objects must now be destroyed before the application can exit.
   Previously, the application terminated if there were no top level windows;
   now it terminates if there are no top level windows or taskbar icons left.
+- wxZlibInputStream is not by default compatible with the output of the
+  2.4.x version of wxZlibOutputStream. However, there is a compatibilty mode,
+  switched on by passing wxZLIB_24COMPATIBLE to the constructor.
+- when WXWIN_COMPATIBILITY_2_4 == 0 wxHashTable uses a new implementation
+  not using wxList keyed interface (the same used when wxUSE_STL == 1),
+  the only incompatibility being that Next() returns a wxHashTable::Node*
+  instead of a wxNode*.
+- non-const wxDC methods GetBackground(), GetBrush(), GetFont() and GetPen()
+  as well as wxWindow methods GetFont() and GetCursor() don't exist any more,
+  please fix your code -- it never worked correctly anyhow if you modified the
+  objects returned by these methods so you should simply switch to using const
+  methods.
+- wxWindow::GetFont() now returns wxFont object instead of reference
+- EVT_XXX macros are now type-safe; code that uses wrong type for event
+  handler's argument will no longer compile.
+- Identical functionality of wxFileDialog::ParseWildcard,
+  wxGenericDirCtrl::ParseFilter, Motif and MSW parsing native dialogs
+  is now accessible in ::wxParseCommonDialogsFilter
+- wxNotebookSizer and wxBookCtrlSizer are now deprecated -- the are no longer
+  needed, you can treat wxNotebook as any other control and put it directly
+  into the sizer that was wxNotebookSizer's parent sizer in old code.
 
-wxTaskBarIcon must be explicitly destroyed now, otherwise the application
-  won't exit even though there are no top level windows
 
 
 DEPRECATED METHODS SINCE 2.4.x
 ==============================
 
-Deprecated methods may still be used but will disappear in future wxWindows
+Deprecated methods may still be used but will disappear in future wxWidgets
 versions, please update your code to not use them.
 
 - wxDocManager::GetNoHistoryFiles() renamed to GetHistoryFilesCount()
@@ -63,10 +169,13 @@
 - wxTheFontMapper: use wxFontMapper::Get() instead
 - wxStringHashTable: use wxHashMap instead
 - wxHashTableLong: use wxHashMap instead
-- wxArrayString::GetStringArray: use wxCArrayString or alternative wxWindows
+- wxArrayString::GetStringArray: use wxCArrayString or alternative wxWidgets
                                  methods taking wxArrayString
 - wxArrayString::Remove(index, count): use RemoveAt instead
 - wxTreeItemId conversion to long is deprecated and shouldn't be used
+- wxTreeCtrl::GetFirst/NextChild() 2nd argument now has type wxTreeItemIdValue
+  and not long, please change declarations of "cookie"s in your code
+  accordingly -- otherwise your code won't work on 64 bit platforms
 - [MSW only] wxWindow::GetUseCtl3D(), GetTransparentBackground() and
              SetTransparent() as well as wxNO_3D and wxUSER_COLOURS styles
 - wxList keyed interface: use wxHashMap instead
@@ -75,20 +184,143 @@
                      wxHashTable::compatibility_iterator to store the return
                      value
 - wxWave class; use wxSound instead
+- The wxHIDE_READONLY flag for wxFileDialog was not implemented
+  and has now been removed
+- wxTaskBarIcon::OnXXX() virtual methods: use events instead
+- obsolete and not used wxUSE_GENERIC_DIALOGS_IN_MSW has been removed
 
 
 OTHER CHANGES
 =============
 
+2.5.3
+-----
+
+All:
+
+- number of fixes to wxPluginManager (Rick Brice, Hans Van Leemputten)
+- fixed memory leak in wxURL when using a proxy (Steven Van Ingelgem)
+- fixed bug in wxDateTime::Set(jdn) when DST was in effect
+- fixed fatal bug in wxString when wxUSE_STL==1 (Kurt Granroth)
+- support msgids in charsets other than C and languages other than English
+  (based on patch by Stefan Kowski)
+- added wxMicroSleep() and wxMilliSleep() replacing deprecated wxUsleep()
+- basic UDP sockets support (Lenny Maiorani)
+- fixed wxDateTime::GetWeekDayName() for some dates (Daniel Kaps)
+- deprecated wxDateTime::SetToTheWeek() in favour of SetToWeekOfYear()
+
+All (GUI):
+
+- added wxWindow::MoveBefore/AfterInTabOrder() to change tab navigation order
+- added wxTaskBarIcon::CreatePopupMenu which is now recommended way
+  of showing popup menu; calling wxTaskBarIcon::PopupMenu directly
+  is discouraged
+- added ..._CMD_...(id) variants for wxGrid event table entry macros
+- added wxWindow::Navigate for programmatic navigation to the next control.
+- wxTextCtrl::OnChar now inserts a tab character if wxTE_PROCESS_TAB is set
+- added wxKeyEvent::GetUnicodeKey()
+- added wxKeyEvent::CmdDown() and wxMouseEvent::CmdDown()
+- implemented wxListCtrl::FindItem() for non-MSW (Robin Stoll)
+- added status bar fields styles support (Tim Kosse)
+- added samples/splash
+- added support for stock buttons
+- added wxTopLevelWindow::RequestUserAttention()
+- support for comma in contrib gizmo wxLEDNumberCtrl (Grant Likely)
+- recursive wxSizer::Show for subsizer and return value if element was found
+
+Unix:
+
+- wxTaskBarIcon now supports freedesktop.org System Tray protocol
+- security fixes to wxSingleInstanceChecker
+- wx-config script was modified to allow choosing from multiple installed
+  builds of wxWidgets and to return flags/libs for selected libraries only
+- wx-config has new --version-full option
+
+wxGTK:
+
+- wxGTK uses GTK+ 2.x by default now, you have to pass --disable-gtk2 to
+  configure if you want to use GTK+ 1.2
+- fixed many rendering artifacts and wrong colours with lots of GTK+ themes
+- implemented wxColourDialog as native dialog
+- implemented wxTextCtrl::HitTest() (GTK+ >= 2)
+- implemented wxTextCtrl::ScrollLines() and ScrollPages for GTK+ 2.x
+- wxTreeCtrl::GetCount() counts root as well now (compatible with MSW)
+- added support for wxCHK_3STATE style (GTK2 only)
+- implemented text underlining under GTK2
+- implemented wxFRAME_NO_TASKBAR style (GTK >= 2.2)
+- implemented support for wxSYS_DCLICK_?, wxSYS_DRAG_? and wxSYS_CURSOR_?
+  in wxSystemSettings::GetMetric (Mart Raudsepp)
+- implemented wxTopLevel::IsMaximized() for GTK+2 and WMs that implement
+  freedesktop.org's wm-spec (Mart Raudsepp)
+- wxEVT_CONTEXT_MENU is now generated for right mouse press, not release
+- implemented alpha channel support in wxBitmap
+- added native GTK+2 wxArtProvider implementation with ability to load
+  icons from icon theme in addition to recognized stock art
+
+wxMotif:
+
+- added support for wxCHK_3STATE style (3 state checkbox)
+
+wxMSW:
+
+- fixed UNC paths handling in wxFileSystem (Daniel Nash)
+- set wxKeyEvent::m_uniChar in Unicode build
+- support for alpha channel in toolbar bitmaps (Jurgen Doornik)
+- wxFileDialog can now be moved and centered (Randall Fox)
+- restored (and improved) possibility to use wx with MFC broken in 2.5.2
+- fixed wxTextCtrl::SetMaxLength for rich edit controls
+- fixed flat style for toolbars under XP, Windows Classic style
+- fixed truncation of transferred data in wxConnection under unicode build
+- wxChoice and wxComboBox dropdown background can be set now too (Adrian Lupei)
+
+wxUniv/X11:
+
+- fixed fatal crash when opening a menu
+
+wxWinCE:
+
+- added native SmartPhone wxTextCtrl implementation using spinners
+- added native SmartPhone wxChoice implementation using spinners
+- added automatized but customizable handling of native SmartPhone menus
+- fixed wxRadioBox and wxStaticBox
+
+wxHTML:
+
+- added support for nested index entries and index entries pointing to more
+  than one page to wxHtmlHelpController
+
+
 2.5.2
 -----
 
 All:
 
+- Hindi translation added (Dhananjaya Sharma)
+- Brazilian Portuguese translation added (E. A. Tacao)
+- wxDynamicCast() now uses static_cast<wxObject *> internally and so using it
+  with anything not deriving from wxObject will fail at compile time (instead
+  of run-time) now
+- when wxUSE_STL == 1 and STL provides quasi-standard hash_map/hash_set,
+  wxHashMap/wxHashSet are just typedefs for them. This makes impossible
+  to forward declare these classes.
+
 All (GUI):
 
 - wxHtmlWindow now delays image scaling until rendering,
   resulting in much better display of scaled images
+- Added UpdateSize to wxSplitterWindow to allow layout while hidden
+- implemented Freeze/Thaw() for wxGenericTreeCtrl (Kevin Hock)
+- support for KOI8-U encoding added (Yuriy Tkachenko)
+- The old wxADJUST_MINSIZE behaviour is now the default behaviour for
+  sizer items that are windows.  This means that GetAdjustedBestSize
+  will now be called by default to determine the minimum size that a
+  window in a sizer should have.  If you want to still use the initial
+  size (and not the BestSize) then use the wxFIXED_MINSIZE flag.  When
+  windows are added to a sizer their initial size is made the window's
+  min size using SetSizeHints, and calls to wxSizer::SetItemMinSize
+  are also forwarded to SetSizeHints for window items.
+- added wxRegEx::GetMatchCount()
+- it is now possible to display images in wxHtmlListBox
 
 wxMSW:
 
@@ -100,16 +332,41 @@
   even try to do it by default -- now it does
 - wxTaskBarIcon must be explicitly destroyed now, otherwise the application
   won't exit even though there are no top level windows
+- wxFileName::GetModificationTime() works with opened files too now
+- wxDC::GetClippingBox() now works even for clipping regions created by Windows
+- fixed wxFileDataObject in Unicode build (Alex D)
+- subdindented paragraphs support (Tim Kosse)
+
+wxGTK:
+
+- added support for wxTE_RIGHT and wxTE_CENTRE styles under GTK2 (Mart Raudsepp)
 
 wxMotif:
 
 - removed wxMenuItem::DeleteSubMenu()
+- wxButtons use Motif default size, which is smaller than it used to be
+  and closer to wxMSW/wxGTK look. This can be disabled by setting
+  motif.largebuttons system option to 1 (see wxSystemOptions).
+
+wxUniv/X11:
+
+- implemented DrawRoundedRectangle() (clawghoul)
 
 wxHTML:
 
 - improved tables and lists layout algorithms (Tim Kosse)
 - <div> handling fix (Xavier Nodet)
 
+Unix:
+
+- fixed priorities of mailcap entries (David Hart)
+- added "wx-config --libs=std,<extra>" syntax (i.e. support for "std")
+
+wxODBC:
+
+- Full Unicode support is now available
+- BLOB support is working
+
 
 2.5.1
 -----
@@ -175,7 +432,7 @@
 
 wxMSW:
 
-- wxWindows now builds under Win64
+- wxWidgets now builds under Win64
 - fixed DDE memory leaks
 - fixed wxTE_*WRAP styles handling
 - wxTextCtrl::GetValue() works with text in non default encoding
@@ -247,7 +504,7 @@
 All:
 
 - It is now possible to build several smaller libraries instead of single
-  huge wxWindows library; wxBase is now dependency of GUI ports rather then
+  huge wxWidgets library; wxBase is now dependency of GUI ports rather then
   separately compiled library
 - added wxDateSpan::operator==() and !=() (Lukasz Michalski)
 - added wxFileName::GetForbiddenChars() (Dimitri Schoolwerth)
@@ -411,7 +668,7 @@
 - improved border handling under Windows XP
 - partial fix for wxNotebook pages looking bad under XP: wxUSE_UXTHEME
   enables XP theme engine code, and wxUSE_UXTHEME_AUTO tells
-  wxWindows to use the theme tab colour for control backgrounds.
+  wxWidgets to use the theme tab colour for control backgrounds.
 - disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles under Windows XP
 - fixed release mode build with VC 7.x (Martin Ecker)
 - added support for wxALWAYS_SHOW_SB style
@@ -462,7 +719,7 @@
     2.6 release.
 
     NB: if you want to build your program with different major versions
-        of wxWindows you will probably find the wxCHECK_VERSION() macro
+        of wxWidgets you will probably find the wxCHECK_VERSION() macro
         (see the documentation) useful.
 
 
@@ -679,10 +936,10 @@
 
 Unix (Base/GUI):
 
-- wxWindows may be built using BSD and Solaris (and possibly other) make
+- wxWidgets may be built using BSD and Solaris (and possibly other) make
   programs and not only GNU make
 - wxTCP-based IPC classes now support communicating over Unix domain sockets
-- wxWindows may be built as a dynamic shared library under Darwin / Mac OS X
+- wxWidgets may be built as a dynamic shared library under Darwin / Mac OS X
   lazy linking issues have been solved by linking a single module (.o) into
   the shared library (two step link using distrib/mac/shared-ld-sh)
 - fixed thread priority setting under Linux
@@ -694,7 +951,7 @@
 - implemented radio menu items and radio toolbar buttons
 - added possibility to show text in the toolbar buttons
 - added wxArtProvider class that can be used to customize the look of standard
-  wxWindows dialogs
+  wxWidgets dialogs
 - significantly improved native font support
 - wxImage::ComputeHistogram() now uses wxImageHistogram instead of type-unsafe
   wxHashTable
@@ -735,11 +992,11 @@
 - fixed multiple bugs in wxExecute() with IO redirection
 - refresh the buttons properly when the window is resized (Hans Van Leemputten)
 - huge (40*) speed up in wxMask::Create()
-- changing wxWindows styles also changes the underlying Windows window style
+- changing wxWidgets styles also changes the underlying Windows window style
 - wxTreeCtrl supports wxTR_HIDE_ROOT style (George Policello)
 - fixed flicker in wxTreeCtrl::SetItemXXX()
 - fixed redraw problems in dynamically resized wxStaticText
-- improvements to wxWindows applications behaviour when the system colours
+- improvements to wxWidgets applications behaviour when the system colours
   are changed
 - choose implicit parent for the dialog boxes better
 - fixed wxProgressDialog for ranges > 65535
@@ -928,7 +1185,7 @@
 - Fixed wxFrame::SetClientSize() with toolbar bug
 - Added mousewheel processing
 - Added wxSystemSettings::Get/SetOption so we can configure
-  wxWindows at run time; used this to implement no-maskblt option
+  wxWidgets at run time; used this to implement no-maskblt option
   in wxDC
 - Fixed bug when using MDIS_ALLCHILDSTYLES style: so now MDI
   child frame styles are honoured
@@ -1198,7 +1455,7 @@
   fixed handling of relative and absolute font sizes in <font size>
 
 
-NOTE: for changes after wxWindows 2.1.0 b4, please see the CVS
+NOTE: for changes after wxWidgets 2.1.0 b4, please see the CVS
 change log.
 
 2.1.0, b4, May 9th 1999
@@ -1296,7 +1553,7 @@
 
 - Makefiles for more compilers and samples; Cygwin makefiles
   rationalised.
-- Added VC++ project file for compiling wxWindows as DLL.
+- Added VC++ project file for compiling wxWidgets as DLL.
 
 wxMotif:
 
@@ -1624,7 +1881,7 @@
 - Added wxJoystick class and event handling, and simple demo.
 - Added simple wxWave class. Needs Stop() function.
 - Added wxModule (module.h/module.cpp) to allow definition
-  of modules to be initialized and cleaned up on wxWindows
+  of modules to be initialized and cleaned up on wxWidgets
   startup/exit.
 - Start of Mingw32 compatibility (see minimal and dialogs samples
   makefile.m95 files, and install.txt).
@@ -1666,7 +1923,7 @@
 - Added wxTaskBarIcon (taskbar.cpp/h, plus samples/taskbar)
   to allow maintenance of an icon in the Windows 95 taskbar
   tray area.
-- Got MFC sample working (MFC and wxWindows in the same
+- Got MFC sample working (MFC and wxWidgets in the same
   application), partly by tweaking ntwxwin.mak settings.
 - Got DLL compilation working again (VC++).
 - Changed wxProp/Dialog Editor filenames.

Index: internal/wxPython-2.5/distrib/msw/makesetup.sh
diff -u internal/wxPython-2.5/distrib/msw/makesetup.sh:2.1.5.1 internal/wxPython-2.5/distrib/msw/makesetup.sh:2.2
--- internal/wxPython-2.5/distrib/msw/makesetup.sh:2.1.5.1	Thu Apr  8 18:15:15 2004
+++ internal/wxPython-2.5/distrib/msw/makesetup.sh	Wed Sep 22 14:21:02 2004
@@ -15,6 +15,7 @@
 SPINOS2=0
 SPINDOCS=1
 SPINALL=1
+SPINWXALL=1
 VERBOSE=0
 ZIPFLAGS=
 
@@ -22,7 +23,7 @@
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
-VERSION=2.5.1
+VERSION=2.5.2
 
 . $SCRIPTDIR/setup.var
 
@@ -115,13 +116,13 @@
     zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
 
-    # Rearchive under wxWindows-$VERSION
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    # Rearchive under wxWidgets-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
     unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
     # No longer do this, configure should be OK
     # echo Overwriting with OS2-specific versions of configure files...
@@ -145,7 +146,7 @@
     cd $DESTDIR
 
     rm -f wxOS2-$VERSION.zip
-    zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWindows-$VERSION/*
+    zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWidgets-$VERSION/*
 }
 
 dospinmac()
@@ -158,6 +159,7 @@
 
     zip $ZIPFLAGS -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/generic.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/mac.rsp
+    zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/cocoa.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/cw_mac.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/tiff.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/jpeg.rsp
@@ -170,16 +172,16 @@
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
     zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
 
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
 
     rm -f $APPDIR/include/wx/setup.h
 
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
     unzip $ZIPFLAGS ../wxMac-$VERSION.zip
     rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
     rm -f -r docs/html/tex2rtf docs/htmlhelp
@@ -195,40 +197,43 @@
     cd $DESTDIR
 
     rm -f wxMac-$VERSION.zip
-    zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWindows-$VERSION/*
+    zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWidgets-$VERSION/*
 }
 
 dospinmsw()
 {
     cd $APPDIR
 
-    # Create wxWindows-$VERSION-win.zip which is used to create wxMSW
+    # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
     echo Zipping individual components
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
-
-#    rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
-
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
-    fi
-
-    mkdir $DESTDIR/wxWindows-$VERSION
-    cd $DESTDIR/wxWindows-$VERSION
-    unzip $ZIPFLAGS ../wxWindows-$VERSION-win.zip
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
+
+#    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
+
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
+    unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
 
     echo Removing .mms files
     rm -f src/gtk/descrip.mms src/motif/descrip.mms
@@ -243,53 +248,110 @@
 
     cd $DESTDIR
 
-    rm -f wxWindows-$VERSION-win.zip
-    zip $ZIPFLAGS -r wxWindows-$VERSION-win.zip wxWindows-$VERSION/*
+    rm -f wxWidgets-$VERSION-win.zip
+    zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/*
+}
+
+dospinwxall()
+{
+    cd $APPDIR
+
+    # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
+    echo Zipping individual components
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cw.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cw_mac.rsp
+
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/x11.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/cocoa.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/motif.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mac.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mgl.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/os2.rsp
+
+#    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
+
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWidgets-$VERSION
+    cd $DESTDIR/wxWidgets-$VERSION
+    unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
+
+    echo Copying readme files...
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt
+
+    cd $DESTDIR
+
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
+    zip $ZIPFLAGS -r wxAll-$VERSION.zip wxWidgets-$VERSION/*
 }
 
 dospindocs()
 {
     cd $APPDIR
 
-    echo Creating $DESTDIR/wxWindows-$VERSION-DocSource.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
-    rearchive wxWindows-$VERSION-DocSource.zip wxWindows-$VERSION $DESTDIR
-
-    echo Creating $DESTDIR/wxWindows-$VERSION-WinHelp.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
-    rearchive wxWindows-$VERSION-WinHelp.zip wxWindows-$VERSION $DESTDIR
-
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTML.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
-    rearchive wxWindows-$VERSION-HTML.zip wxWindows-$VERSION $DESTDIR
-
-    echo Creating $DESTDIR/wxWindows-$VERSION-PDF.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
-    rearchive wxWindows-$VERSION-PDF.zip wxWindows-$VERSION $DESTDIR
-
-    # zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
-    # rearchive wxWindows-$VERSION-Word.zip wxWindows-$VERSION $DESTDIR
-
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTB.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
-    rearchive wxWindows-$VERSION-HTB.zip wxWindows-$VERSION $DESTDIR
-
-    echo Creating $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
-    rearchive wxWindows-$VERSION-HTMLHelp.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-DocSource.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
+    rearchive wxWidgets-$VERSION-DocSource.zip wxWidgets-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWidgets-$VERSION-WinHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
+    rearchive wxWidgets-$VERSION-WinHelp.zip wxWidgets-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTML.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
+    rearchive wxWidgets-$VERSION-HTML.zip wxWidgets-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWidgets-$VERSION-PDF.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    rearchive wxWidgets-$VERSION-PDF.zip wxWidgets-$VERSION $DESTDIR
+
+    # zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
+    # rearchive wxWidgets-$VERSION-Word.zip wxWidgets-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTB.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
+    rearchive wxWidgets-$VERSION-HTB.zip wxWidgets-$VERSION $DESTDIR
+
+    echo Creating $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
+    rearchive wxWidgets-$VERSION-HTMLHelp.zip wxWidgets-$VERSION $DESTDIR
 
     # Add Linuxy docs to a separate archive to be transported to Linux for the
     # Linux-based releases
-    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
+    echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
 
     # PDF/HTML docs that should go into the Windows setup because
     # there are no WinHelp equivalents
-    echo Creating $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
-    rearchive wxWindows-$VERSION-ExtraDoc.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
+    rearchive wxWidgets-$VERSION-ExtraDoc.zip wxWidgets-$VERSION $DESTDIR
 }
 
 dospinmisc()
@@ -297,24 +359,34 @@
     cd $APPDIR
 
     # zip up Univ-specific files
-    echo Creating $DESTDIR/wxWindows-$VERSION-Univ.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
-    rearchive wxWindows-$VERSION-Univ.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-Univ.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
+    rearchive wxWidgets-$VERSION-Univ.zip wxWidgets-$VERSION $DESTDIR
 
     # VC++ project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-VC.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
-    # rearchive wxWindows-$VERSION-VC.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-VC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
+    # rearchive wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION $DESTDIR
+
+    # eVC++ project files
+    echo Creating $DESTDIR/wxWidgets-$VERSION-eVC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-eVC.zip < $APPDIR/distrib/msw/wince.rsp
+    # rearchive wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION $DESTDIR
+
+    # DMC project files
+    echo Creating $DESTDIR/wxWidgets-$VERSION-DMC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DMC.zip < $APPDIR/distrib/msw/dmc.rsp
+    # rearchive wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION $DESTDIR
 
     # BC++ project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-BC.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
-    # rearchive wxWindows-$VERSION-BC.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
+    # rearchive wxWidgets-$VERSION-BC.zip wxWidgets-$VERSION $DESTDIR
 
     # CodeWarrior project files
-    echo Creating $DESTDIR/wxWindows-$VERSION-CW.zip
-    zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
-    # rearchive wxWindows-$VERSION-CW.zip wxWindows-$VERSION $DESTDIR
+    echo Creating $DESTDIR/wxWidgets-$VERSION-CW.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
+    # rearchive wxWidgets-$VERSION-CW.zip wxWidgets-$VERSION $DESTDIR
 }
 
 dospinsetup()
@@ -322,23 +394,23 @@
     cd $DESTDIR
 
     # Put all archives for transit to Linux in a zip file
-    echo Creating $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
-    rm -f $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
-    zip $ZIPFLAGS $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip wxWindows-$VERSION-LinuxDocs.zip wxWindows-$VERSION-VC.zip wxWindows-$VERSION-CW-Mac.zip
-
-    echo Unzipping the Windows files into wxWindows-$VERSION
-
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-win.zip
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-VC.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-BC.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-CW.zip -d wxWindows-$VERSION
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-HTMLHelp.zip
-    unzip $ZIPFLAGS -o wxWindows-$VERSION-ExtraDoc.zip
+    echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
+    rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
+    zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION-CW-Mac.zip
+
+    echo Unzipping the Windows files into wxWidgets-$VERSION
+
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-VC.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-ExtraDoc.zip
 
     # After this change of directory, we're in the
     # temporary 'wx' directory and not acting on
-    # the source wxWindows directory.
-    cd $DESTDIR/wxWindows-$VERSION
+    # the source wxWidgets directory.
+    cd $DESTDIR/wxWidgets-$VERSION
 
     # Now delete a few files that are unnecessary
     #attrib -R *
@@ -369,8 +441,8 @@
 
     # Make wxMSW-xxx.zip
     cd $DESTDIR
-    zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWindows-$VERSION/*
-    cd wxWindows-$VERSION
+    zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWidgets-$VERSION/*
+    cd wxWidgets-$VERSION
 
     echo Generating $SETUPSCRIPTNAME
     rm -f $SETUPSCRIPTNAME
@@ -448,8 +520,8 @@
     echo Putting all the setup files into a single zip archive
     zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
 
-    rm -f wxWindows-$VERSION-win.zip
-    rm -f wxWindows-$VERSION-ExtraDoc.zip
+    rm -f wxWidgets-$VERSION-win.zip
+    rm -f wxWidgets-$VERSION-ExtraDoc.zip
 
     echo If you saw no warnings or errors, $APPTITLE was successfully spun.
     echo
@@ -514,8 +586,8 @@
     if [ ! -d $DESTDIR ]; then
         mkdir $DESTDIR
     fi
-    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
-        rm -f -r $DESTDIR/wxWindows-$VERSION
+    if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWidgets-$VERSION
     fi
 
     # Copy FAQ from wxWebSite CVS
@@ -549,6 +621,11 @@
         dospinmsw
     fi
 
+    # Do wxAll spin
+    if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then
+        dospinwxall
+    fi
+
     # Do docs spin
     if [ "$SPINDOCS" = "1" ] || [ "$SPINALL" = "1" ]; then
         dospindocs
@@ -558,25 +635,38 @@
     dospinmisc
 
     cp $APPDIR/docs/changes.txt $DESTDIR/changes-$VERSION.txt
+    cp $APPDIR/docs/readme.txt $DESTDIR/readme-$VERSION.txt
+
+    cp $APPDIR/docs/msw/readme.txt $DESTDIR/readme-msw-$VERSION.txt
     cp $APPDIR/docs/msw/install.txt $DESTDIR/install-msw-$VERSION.txt
+
+    cp $APPDIR/docs/mac/readme.txt $DESTDIR/readme-mac-$VERSION.txt
     cp $APPDIR/docs/mac/install.txt $DESTDIR/install-mac-$VERSION.txt
+
+    cp $APPDIR/docs/motif/readme.txt $DESTDIR/readme-motif-$VERSION.txt
     cp $APPDIR/docs/motif/install.txt $DESTDIR/install-motif-$VERSION.txt
+
+    cp $APPDIR/docs/gtk/readme.txt $DESTDIR/readme-gtk-$VERSION.txt
     cp $APPDIR/docs/gtk/install.txt $DESTDIR/install-gtk-$VERSION.txt
+
+    cp $APPDIR/docs/x11/readme.txt $DESTDIR/readme-x11-$VERSION.txt
+#    cp $APPDIR/docs/x11/readme-nanox.txt $DESTDIR/readme-nanox-$VERSION.txt
     cp $APPDIR/docs/x11/install.txt $DESTDIR/install-x11-$VERSION.txt
+
     cp $APPDIR/docs/mgl/readme.txt $DESTDIR/readme-mgl-$VERSION.txt
     cp $APPDIR/docs/mgl/install.txt $DESTDIR/install-mgl-$VERSION.txt
 
-    cp $APPDIR/docs/readme.txt $DESTDIR/readme-$VERSION.txt
-    cp $APPDIR/docs/motif/readme.txt $DESTDIR/readme-motif-$VERSION.txt
-    cp $APPDIR/docs/gtk/readme.txt $DESTDIR/readme-gtk-$VERSION.txt
-    cp $APPDIR/docs/x11/readme.txt $DESTDIR/readme-x11-$VERSION.txt
-    cp $APPDIR/docs/x11/readme-nanox.txt $DESTDIR/readme-nanox-$VERSION.txt
-    cp $APPDIR/docs/msw/readme.txt $DESTDIR/readme-msw-$VERSION.txt
-    cp $APPDIR/docs/mac/readme.txt $DESTDIR/readme-mac-$VERSION.txt
+    cp $APPDIR/docs/cocoa/readme.txt $DESTDIR/readme-cocoa-$VERSION.txt
+    cp $APPDIR/docs/cocoa/install.txt $DESTDIR/install-cocoa-$VERSION.txt
+
     cp $APPDIR/docs/base/readme.txt $DESTDIR/readme-base-$VERSION.txt
+
     cp $APPDIR/docs/os2/install.txt $DESTDIR/install-os2-$VERSION.txt
+
     cp $APPDIR/docs/univ/readme.txt $DESTDIR/readme-univ-$VERSION.txt
+
     cp $APPDIR/docs/readme_vms.txt $DESTDIR/readme-vms-$VERSION.txt
+
     # cp $APPDIR/docs/motif/makewxmotif $DESTDIR/makewxmotif-$VERSION
     # cp $APPDIR/docs/gtk/makewxgtk $DESTDIR/makewxgtk-$VERSION
     
@@ -587,7 +677,7 @@
 }
 
 # We can't use e.g. this:
-# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 # So if we need to (not in this script so far) we do something like this instead:
@@ -620,6 +710,7 @@
     echo "    --wxmac           Build wxMac distribution"
     echo "    --wxmsw           Build wxMSW distribution"
     echo "    --wxos2           Build wxOS2 distribution"
+    echo "    --wxall           Build wxAll zip distribution"
     echo "    --docs            Build docs archives"
     echo "    --all             Build all distributions (the default)"
     echo "    --verbose         Verbose zip operation"
@@ -639,6 +730,7 @@
 	--wxmac) SPINMAC=1; SPINALL=0 ;;
 	--wxmsw) SPINMSW=1; SPINALL=0 ;;
 	--wxos2) SPINOS2=1; SPINALL=0 ;;
+	--wxall) SPINWXALL=1; SPINALL=0 ;;
 	--docs) SPINDOCS=1; SPINALL=0 ;;
 	--all) SPINALL=1 ;;
 	--verbose) VERBOSE=1 ;;



More information about the Commits mailing list