[Commits] (davids) p4 changes.

commits at osafoundation.org commits at osafoundation.org
Tue Sep 14 17:57:25 PDT 2004


Commit by: davids
Modified files:
internal/wxPython-2.5/contrib/build/animate/animate.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/fl/fl.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/net/net.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/ogl/ogl.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/plot/plot.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/stc/stc.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/svg/svg.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/build/xrc/xrc.bkl 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/animate/animate.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/frmview.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/net/email.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/net/msg.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/net/smapi.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/net/web.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/basic.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/composit.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/divided.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/lines.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/misc.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/plot/plot.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/stc/stc.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h 1.1.2.1 1.1.2.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/Makefile.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/animate/animate.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/applet/Makefile.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/doslex.c 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/parser.y 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/prop.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/propform.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/resource.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/controlbar.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/frmview.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/garbagec.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/net/email.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/net/smapi.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/net/web.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/basic.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/basic2.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/canvas.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/composit.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/divided.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/drawn.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/lines.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/plot/plot.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/gen_iface.py 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/stc.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/stc.cpp.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/stc/stc.h.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp 1.1.2.1 1.1.2.2
internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/Makefile.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/open.bmp 2.1.5.1 2.1.5.1.4.1
internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/preview.bmp 2.1.5.1 2.1.5.1.4.1
internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/save.bmp 2.1.5.1 2.1.5.1.4.1

Log message:
p4 changes.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/animate/animate.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/fl/fl.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/net/net.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/ogl/ogl.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/plot/plot.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/stc/stc.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/svg/svg.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/build/xrc/xrc.bkl.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/animate/animate.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/frmview.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/net/email.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/net/msg.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/net/smapi.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/net/web.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/basic.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/composit.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/divided.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/lines.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/misc.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/plot/plot.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/stc/stc.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h.diff?r1=text&tr1=1.1.2.1&r2=text&tr2=1.1.2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/Makefile.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/animate/animate.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/applet/Makefile.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/doslex.c.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/parser.y.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/prop.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/propform.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/resource.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/controlbar.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/frmview.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/garbagec.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/net/email.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/net/smapi.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/net/web.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/basic.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/basic2.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/canvas.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/composit.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/divided.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/drawn.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/lines.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/plot/plot.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/gen_iface.py.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/stc.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/stc.cpp.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/stc/stc.h.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp.diff?r1=text&tr1=1.1.2.1&r2=text&tr2=1.1.2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/Makefile.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/open.bmp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.1.5.1.4.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/preview.bmp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.1.5.1.4.1
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/contrib/utils/wxrcedit/bitmaps/save.bmp.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.1.5.1.4.1

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_text.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxTextCtrl
 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_text.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_text.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/lines.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/lines.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/lines.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/lines.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/lines.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: lines.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: lines.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndfile.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999, 2000
-// CVSID: $Id: sndfile.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndfile.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #include "wx/wxprec.h"
 

Index: internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h
diff -u internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/ScintillaWX.h	Tue Sep 14 17:57:03 2004
@@ -9,7 +9,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: ScintillaWX.h,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+// RCS-ID:      $Id: ScintillaWX.h,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: pe_basic.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: pe_basic.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_chckl.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxCheckList
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_chckl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_chckl.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/treelay.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     7/4/98
-// RCS-ID:      $Id: treelay.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: treelay.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/animate/animate.bkl
diff -u internal/wxPython-2.5/contrib/build/animate/animate.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/animate/animate.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/animate/animate.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:54 2004
+++ internal/wxPython-2.5/contrib/build/animate/animate.bkl	Tue Sep 14 17:56:40 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: animate.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:54 heikki Exp $ -->
+<!-- $Id: animate.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:40 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/ogl/composit.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/composit.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/composit.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/composit.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/composit.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: composit.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: composit.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndwin.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999, 2000
-// CVSID: $Id: sndwin.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndwin.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndwin.cpp"

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: nodehnd.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: nodehnd.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_sizer.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/04/24
-// RCS-ID:      $Id: xh_sizer.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_sizer.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/garbagec.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/garbagec.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/garbagec.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/garbagec.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/garbagec.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     18/10/98
-// RCS-ID:      $Id: garbagec.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: garbagec.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/vidbase.h	Tue Sep 14 17:56:51 2004
@@ -5,7 +5,7 @@
 // Created:    1997
 // Updated:    1998
 // Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS:        $Id: vidbase.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVS:        $Id: vidbase.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // License:    wxWindows license
 // /////////////////////////////////////////////////////////////////////////////
 /* Real -*- C++ -*- */

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndmsad.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose: MS ADPCM codec
 // Date: 25/02/2000
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 2000
-// CVSID: $Id: sndmsad.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndmsad.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDMSAD_H
 #define _WX_SNDMSAD_H

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmp.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/00
-// RCS-ID:      $Id: xh_bmp.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_bmp.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/pe_basic.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: pe_basic.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: pe_basic.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_wizrd.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/02
-// RCS-ID:      $Id: xh_wizrd.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_wizrd.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/doslex.c
diff -u internal/wxPython-2.5/contrib/src/deprecated/doslex.c:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/doslex.c:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/doslex.c:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/doslex.c	Tue Sep 14 17:56:57 2004
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /usr/local/cvsrep/internal/wxPython-2.5/contrib/src/deprecated/doslex.c,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+ * $Header: /usr/local/cvsrep/internal/wxPython-2.5/contrib/src/deprecated/doslex.c,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 

Index: internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp
diff -u internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/gizmos/dynamicsash.cpp	Tue Sep 14 17:56:59 2004
@@ -5,7 +5,7 @@
 // Author:      Matt Kimball
 // Modified by:
 // Created:     7/15/2001
-// RCS-ID:      $Id: dynamicsash.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// RCS-ID:      $Id: dynamicsash.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:59 davids Exp $
 // Copyright:   (c) 2001 Matt Kimball
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_panel.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_panel.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_panel.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_frame.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for dialogs
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_frame.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_frame.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl
diff -u internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:54 2004
+++ internal/wxPython-2.5/contrib/build/deprecated/deprecated.bkl	Tue Sep 14 17:56:41 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: deprecated.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:54 heikki Exp $ -->
+<!-- $Id: deprecated.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:41 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndbase.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndbase.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndbase.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDBASE_H
 #define _WX_SNDBASE_H

Index: internal/wxPython-2.5/contrib/include/wx/fl/frmview.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/frmview.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/frmview.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/frmview.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/frmview.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     02/01/99
-// RCS-ID:      $Id: frmview.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: frmview.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/net/smapi.h
diff -u internal/wxPython-2.5/contrib/include/wx/net/smapi.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/net/smapi.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/net/smapi.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/net/smapi.h	Tue Sep 14 17:56:52 2004
@@ -4,7 +4,7 @@
 // Author:      PJ Naughter <pjna at naughter.com>
 // Modified by: Julian Smart
 // Created:     2001-08-21
-// RCS-ID:      $Id: smapi.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// RCS-ID:      $Id: smapi.h,v 2.1.5.1.4.2 2004/09/15 00:56:52 davids Exp $
 // Copyright:   (c) PJ Naughter
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_html.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxHtmlWindow
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_html.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_html.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/preview.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: preview.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: preview.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.cpp	Tue Sep 14 17:57:08 2004
@@ -6,7 +6,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     8/7/2000
-// RCS-ID:      $Id: splittree.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: splittree.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/parser.y
diff -u internal/wxPython-2.5/contrib/src/deprecated/parser.y:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/parser.y:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/parser.y:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/parser.y	Tue Sep 14 17:56:57 2004
@@ -1,4 +1,4 @@
-/* Version: $Id: parser.y,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $ */
+/* Version: $Id: parser.y,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $ */
  %{
 #include "wx/setup.h"
 #include <string.h>

Index: internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/constrnt.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: constrnt.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: constrnt.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/editor.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: editor.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: editor.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/net/web.cpp
diff -u internal/wxPython-2.5/contrib/src/net/web.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/net/web.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/net/web.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:20 2004
+++ internal/wxPython-2.5/contrib/src/net/web.cpp	Tue Sep 14 17:57:01 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-08-21
-// RCS-ID:      $Id: web.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:20 heikki Exp $
+// RCS-ID:      $Id: web.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:01 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndesd.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndesd.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndesd.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDESD_H
 #define _WX_SNDESD_H

Index: internal/wxPython-2.5/contrib/src/animate/animate.cpp
diff -u internal/wxPython-2.5/contrib/src/animate/animate.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/animate/animate.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/animate/animate.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:14 2004
+++ internal/wxPython-2.5/contrib/src/animate/animate.cpp	Tue Sep 14 17:56:56 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by:
 // Created:     13/8/99
-// RCS-ID:      $Id: animate.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:14 heikki Exp $
+// RCS-ID:      $Id: animate.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:56 davids Exp $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp
diff -u internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:24 2004
+++ internal/wxPython-2.5/contrib/src/svg/dcsvg.cpp	Tue Sep 14 17:57:04 2004
@@ -3,7 +3,7 @@
 // Purpose:     SVG sample
 // Author:      Chris Elliott
 // Modified by:
-// RCS-ID:      $Id: dcsvg.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:24 heikki Exp $
+// RCS-ID:      $Id: dcsvg.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:04 davids Exp $
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndoss.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndoss.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndoss.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDOSS_H
 #define _WX_SNDOSS_H

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_all.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     includes all xh_*.h files
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_all.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_all.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndpcm.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndpcm.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndpcm.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndpcm.cpp"

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndcpcm.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndcpcm.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndcpcm.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDCPCM_H
 #define _WX_SNDCPCM_H

Index: internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xmlrsall.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     wxXmlResource::InitAllHandlers
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xmlrsall.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xmlrsall.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/toolwnd.h	Tue Sep 14 17:56:49 2004
@@ -5,7 +5,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: toolwnd.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: toolwnd.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_radbx.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxRadioBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_radbx.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_radbx.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/panedrawpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: panedrawpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: panedrawpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndaiff.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndaiff.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndaiff.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDAIFF_H
 #define _WX_SNDAIFF_H

Index: internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/linesp.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: linesp.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: linesp.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckl.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxCheckListBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_chckl.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_chckl.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_panel.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_panel.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_panel.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_combo.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxComboBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_combo.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_combo.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/basicp.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: basicp.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: basicp.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_listb.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxListBox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29
-// RCS-ID:      $Id: xh_listb.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_listb.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/gcupdatesmgr.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     19/10/98
-// RCS-ID:      $Id: gcupdatesmgr.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: gcupdatesmgr.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndulaw.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndulaw.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndulaw.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndulaw.cpp"

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: propframe.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: propframe.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbt.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for radio buttons
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_radbt.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_radbt.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/gcupdatesmgr.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     19/10/98
-// RCS-ID:      $Id: gcupdatesmgr.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: gcupdatesmgr.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_split.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxSplitterWindow
 // Author:      panga at freemail.hu, Vaclav Slavik
 // Created:     2003/01/26
-// RCS-ID:      $Id: xh_split.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_split.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2003 panga at freemail.hu, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/treedt.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: treedt.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: treedt.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/drawn.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: drawn.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: drawn.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_stlin.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxStaticLine
 // Author:      Vaclav Slavik
 // Created:     2000/09/00
-// RCS-ID:      $Id: xh_stlin.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_stlin.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndbase.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999, 2000
-// CVSID: $Id: sndbase.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndbase.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndbase.cpp"

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndpcm.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndpcm.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndpcm.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDPCM_H
 #define _WX_SNDPCM_H

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_dlg.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for dialogs
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_dlg.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_dlg.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/splittree.h	Tue Sep 14 17:57:08 2004
@@ -6,7 +6,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     8/7/2000
-// RCS-ID:      $Id: splittree.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: splittree.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_notbk.h	Tue Sep 14 17:56:54 2004
@@ -2,7 +2,7 @@
 // Name:        xh_notbk.h
 // Purpose:     XML resource handler for wxNotebook
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: xh_notbk.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_notbk.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/nodehnd.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: nodehnd.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: nodehnd.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_sizer.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_sizer.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_sizer.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_notbk.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxNotebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_notbk.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_notbk.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/rowlayoutpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     02/10/98
-// RCS-ID:      $Id: rowlayoutpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: rowlayoutpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_sttxt.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxStaticBitmap
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_sttxt.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_sttxt.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/Makefile.in
diff -u internal/wxPython-2.5/contrib/utils/Makefile.in:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/Makefile.in:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/Makefile.in:2.1.5.1.4.1	Mon Sep 13 17:37:26 2004
+++ internal/wxPython-2.5/contrib/utils/Makefile.in	Tue Sep 14 17:57:06 2004
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 2.1.5.1.4.1 2004/09/14 00:37:26 heikki Exp $
+# $Id: Makefile.in,v 2.1.5.1.4.2 2004/09/15 00:57:06 davids Exp $
 
 CONTRIB_UTILS=wxrc wxrcedit convertrc
 

Index: internal/wxPython-2.5/contrib/include/wx/net/web.h
diff -u internal/wxPython-2.5/contrib/include/wx/net/web.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/net/web.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/net/web.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/net/web.h	Tue Sep 14 17:56:52 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-08-21
-// RCS-ID:      $Id: web.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// RCS-ID:      $Id: web.h,v 2.1.5.1.4.2 2004/09/15 00:56:52 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/animate/animate.h
diff -u internal/wxPython-2.5/contrib/include/wx/animate/animate.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/animate/animate.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/animate/animate.h:2.1.5.1.4.1	Mon Sep 13 17:37:04 2004
+++ internal/wxPython-2.5/contrib/include/wx/animate/animate.h	Tue Sep 14 17:56:47 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart and Guillermo Rodriguez Garcia
 // Modified by:
 // Created:     13/8/99
-// RCS-ID:      $Id: animate.h,v 2.1.5.1.4.1 2004/09/14 00:37:04 heikki Exp $
+// RCS-ID:      $Id: animate.h,v 2.1.5.1.4.2 2004/09/15 00:56:47 davids Exp $
 // Copyright:   (c) Julian Smart and Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/stc/stc.h
diff -u internal/wxPython-2.5/contrib/include/wx/stc/stc.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/stc/stc.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/stc/stc.h:2.1.5.1.4.1	Mon Sep 13 17:37:12 2004
+++ internal/wxPython-2.5/contrib/include/wx/stc/stc.h	Tue Sep 14 17:56:54 2004
@@ -12,7 +12,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: stc.h,v 2.1.5.1.4.1 2004/09/14 00:37:12 heikki Exp $
+// RCS-ID:      $Id: stc.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/constrnt.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: constrnt.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: constrnt.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/net/msg.h
diff -u internal/wxPython-2.5/contrib/include/wx/net/msg.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/net/msg.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/net/msg.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/net/msg.h	Tue Sep 14 17:56:52 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-08-21
-// RCS-ID:      $Id: msg.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// RCS-ID:      $Id: msg.h,v 2.1.5.1.4.2 2004/09/15 00:56:52 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/updatesmgr.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     19/10/98
-// RCS-ID:      $Id: updatesmgr.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: updatesmgr.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_gauge.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_gauge.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_gauge.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: propedit.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: propedit.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndcodec.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndcodec.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndcodec.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDCODEC_H
 #define _WX_SNDCODEC_H

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: pe_adv.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: pe_adv.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/frmview.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/frmview.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/frmview.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/frmview.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/frmview.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     02/01/99
-// RCS-ID:      $Id: frmview.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: frmview.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/cdunix.cpp	Tue Sep 14 17:57:00 2004
@@ -5,7 +5,7 @@
 // Created:    1997
 // Updated:    1998
 // Copyright:  (C) 1997, 1998, Guilhem Lavaux
-// CVS Id: $Id: cdunix.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVS Id: $Id: cdunix.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // License:    wxWindows license
 ////////////////////////////////////////////////////////////////////////////////
 #ifdef __GNUG__

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: nodesdb.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: nodesdb.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h
diff -u internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h:2.1.5.1.4.1	Mon Sep 13 17:37:08 2004
+++ internal/wxPython-2.5/contrib/include/wx/gizmos/multicell.h	Tue Sep 14 17:56:50 2004
@@ -4,7 +4,7 @@
 // Author:      Jonathan Bayer
 // Modified by:
 // Created:
-// RCS-ID:      $Id: multicell.h,v 2.1.5.1.4.1 2004/09/14 00:37:08 heikki Exp $
+// RCS-ID:      $Id: multicell.h,v 2.1.5.1.4.2 2004/09/15 00:56:50 davids Exp $
 // Copyright:   (c) Jonathan Bayer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_choic.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_choic.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_choic.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_chckb.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_chckb.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_chckb.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/composit.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/composit.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/composit.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/composit.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/composit.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: composit.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: composit.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/net/email.cpp
diff -u internal/wxPython-2.5/contrib/src/net/email.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/net/email.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/net/email.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:20 2004
+++ internal/wxPython-2.5/contrib/src/net/email.cpp	Tue Sep 14 17:57:01 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-08-21
-// RCS-ID:      $Id: email.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:20 heikki Exp $
+// RCS-ID:      $Id: email.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:01 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndwav.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndwav.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndwav.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndwav.cpp"

Index: internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/rowlayoutpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     09/09/98
-// RCS-ID:      $Id: rowlayoutpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: rowlayoutpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/fl/fl.bkl
diff -u internal/wxPython-2.5/contrib/build/fl/fl.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/fl/fl.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/fl/fl.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:55 2004
+++ internal/wxPython-2.5/contrib/build/fl/fl.bkl	Tue Sep 14 17:56:42 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: fl.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:55 heikki Exp $ -->
+<!-- $Id: fl.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:42 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/src/stc/gen_iface.py
diff -u internal/wxPython-2.5/contrib/src/stc/gen_iface.py:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/gen_iface.py:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/gen_iface.py:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/gen_iface.py	Tue Sep 14 17:57:03 2004
@@ -6,7 +6,7 @@
 # Author:       Robin Dunn
 #
 # Created:      5-Sept-2000
-# RCS-ID:       $Id: gen_iface.py,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+# RCS-ID:       $Id: gen_iface.py,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 # Copyright:    (c) 2000 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_slidr.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxSlider
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_slidr.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_slidr.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/dyntbar.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/10/98
-// RCS-ID:      $Id: dyntbar.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: dyntbar.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/antiflickpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas (@Lithuania)
 // Modified by:
 // Created:     23/10/98
-// RCS-ID:      $Id: antiflickpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: antiflickpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/net/smapi.cpp
diff -u internal/wxPython-2.5/contrib/src/net/smapi.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/net/smapi.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/net/smapi.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:20 2004
+++ internal/wxPython-2.5/contrib/src/net/smapi.cpp	Tue Sep 14 17:57:01 2004
@@ -4,7 +4,7 @@
 // Author:      PJ Naughter <pjna at naughter.com>
 // Modified by: Julian Smart
 // Created:     2001-08-21
-// RCS-ID:      $Id: smapi.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:20 heikki Exp $
+// RCS-ID:      $Id: smapi.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:01 davids Exp $
 // Copyright:   (c) PJ Naughter
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/proplist.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: proplist.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: proplist.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/divided.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/divided.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/divided.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/divided.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/divided.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: divided.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: divided.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/canvas.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/canvas.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/canvas.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/canvas.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/canvas.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: canvas.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: canvas.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/lines.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/lines.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/lines.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/lines.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/lines.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: lines.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: lines.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h:1.1.2.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h:1.1.2.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h:1.1.2.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_tglbtn.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxToggleButton
 // Author:      Julian Smart
 // Created:     2004-08-30
-// RCS-ID:      $Id: xh_tglbtn.h,v 1.1.2.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_tglbtn.h,v 1.1.2.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2004 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndg72x.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndg72x.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndg72x.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDG72X_H
 #define _WX_SNDG72X_H

Index: internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/toolwnd.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: toolwnd.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: toolwnd.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_radbx.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for radio box
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_radbx.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_radbx.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/ogl/ogl.bkl
diff -u internal/wxPython-2.5/contrib/build/ogl/ogl.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/ogl/ogl.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/ogl/ogl.bkl:2.1.5.1.4.1	Mon Sep 13 17:37:00 2004
+++ internal/wxPython-2.5/contrib/build/ogl/ogl.bkl	Tue Sep 14 17:56:44 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: ogl.bkl,v 2.1.5.1.4.1 2004/09/14 00:37:00 heikki Exp $ -->
+<!-- $Id: ogl.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:44 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:27 2004
+++ internal/wxPython-2.5/contrib/utils/wxrc/wxrc.cpp	Tue Sep 14 17:57:07 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource compiler
 // Author:      Vaclav Slavik, Eduardo Marques <edrdo at netcabo.pt>
 // Created:     2000/03/05
-// RCS-ID:      $Id: wxrc.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:27 heikki Exp $
+// RCS-ID:      $Id: wxrc.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:07 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/stc/stc.cpp
diff -u internal/wxPython-2.5/contrib/src/stc/stc.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/stc.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/stc.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/stc.cpp	Tue Sep 14 17:57:03 2004
@@ -10,7 +10,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: stc.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+// RCS-ID:      $Id: stc.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndoss.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999, 2000
-// CVSID: $Id: sndoss.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndoss.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndoss.cpp"

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_scwin.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18
-// RCS-ID:      $Id: xh_scwin.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_scwin.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/tbarsmpl.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
 // Created:     01/02/97
-// RCS-ID:      $Id: tbarsmpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: tbarsmpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/ogldiag.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: ogldiag.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: ogldiag.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/dyntbarhnd.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     23/01/99
-// RCS-ID:      $Id: dyntbarhnd.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: dyntbarhnd.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h
diff -u internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h:2.1.5.1.4.1	Mon Sep 13 17:37:08 2004
+++ internal/wxPython-2.5/contrib/include/wx/gizmos/splittree.h	Tue Sep 14 17:56:50 2004
@@ -6,7 +6,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     8/7/2000
-// RCS-ID:      $Id: splittree.h,v 2.1.5.1.4.1 2004/09/14 00:37:08 heikki Exp $
+// RCS-ID:      $Id: splittree.h,v 2.1.5.1.4.2 2004/09/15 00:56:50 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_menu.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_menu.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_menu.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl
diff -u internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:57 2004
+++ internal/wxPython-2.5/contrib/build/gizmos/gizmos.bkl	Tue Sep 14 17:56:42 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: gizmos.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:57 heikki Exp $ -->
+<!-- $Id: gizmos.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:42 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/editor.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: editor.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: editor.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/stc/stc.cpp.in
diff -u internal/wxPython-2.5/contrib/src/stc/stc.cpp.in:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/stc.cpp.in:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/stc.cpp.in:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/stc.cpp.in	Tue Sep 14 17:57:03 2004
@@ -10,7 +10,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: stc.cpp.in,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+// RCS-ID:      $Id: stc.cpp.in,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_bttn.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_bttn.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_bttn.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_listb.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxListbox
 // Author:      Bob Mitchell & Vaclav Slavik
 // Created:     2000/07/29
-// RCS-ID:      $Id: xh_listb.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_listb.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell & Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/dyntbarhnd.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     23/01/99
-// RCS-ID:      $Id: dyntbarhnd.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: dyntbarhnd.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndulaw.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndulaw.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndulaw.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDULAW_H
 #define _WX_SNDULAW_H

Index: internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp
diff -u internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/gizmos/editlbox.cpp	Tue Sep 14 17:56:59 2004
@@ -2,7 +2,7 @@
 // Name:        editlbox.cpp
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: editlbox.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// RCS-ID:      $Id: editlbox.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:59 davids Exp $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: xmlhelpr.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: xmlhelpr.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/cbcustom.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     28/10/98
-// RCS-ID:      $Id: cbcustom.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: cbcustom.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/expr.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: expr.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: expr.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c)
 // Licence:   	wxWindows licence
 ////////////////////////////////////////////////////////////////////////// */

Index: internal/wxPython-2.5/contrib/src/deprecated/prop.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/prop.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/prop.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/prop.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/prop.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: prop.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: prop.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/controlbar.h	Tue Sep 14 17:56:49 2004
@@ -5,7 +5,7 @@
 // Author:      Aleksandras Gluchovas <mailto:alex at soften.ktu.lt>
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: controlbar.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: controlbar.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/stc/stc.h.in
diff -u internal/wxPython-2.5/contrib/src/stc/stc.h.in:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/stc.h.in:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/stc.h.in:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/stc.h.in	Tue Sep 14 17:57:03 2004
@@ -12,7 +12,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: stc.h.in,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+// RCS-ID:      $Id: stc.h.in,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndwin.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndwin.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndwin.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDWIN_H
 #define _WX_SNDWIN_H

Index: internal/wxPython-2.5/contrib/src/plot/plot.cpp
diff -u internal/wxPython-2.5/contrib/src/plot/plot.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/plot/plot.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/plot/plot.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/plot/plot.cpp	Tue Sep 14 17:57:03 2004
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/01/2000
-// RCS-ID:      $Id: plot.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: plot.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_statbar.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxStatusBar
 // Author:      Brian Ravnsgaard Riis
 // Created:     2004/01/21
-// RCS-ID:      $Id: xh_statbar.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_statbar.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2004 Brian Ravnsgaard Riis
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/basic.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/basic.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/basic.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/basic.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/basic.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: basic.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: basic.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp
diff -u internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/gizmos/splittree.cpp	Tue Sep 14 17:56:59 2004
@@ -6,7 +6,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     8/7/2000
-// RCS-ID:      $Id: splittree.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// RCS-ID:      $Id: splittree.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:59 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_text.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxTextCtrl
 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_text.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_text.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndwav.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndwav.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndwav.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDWAV_H
 #define _WX_SNDWAV_H

Index: internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/rowdragpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/10/98
-// RCS-ID:      $Id: rowdragpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: rowdragpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/barhintspl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     30/11/98 (my 22th birthday :-)
-// RCS-ID:      $Id: barhintspl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: barhintspl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/preview.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: preview.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: preview.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_html.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxHtmlWindow
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_html.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_html.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/xrc/xrc.bkl
diff -u internal/wxPython-2.5/contrib/build/xrc/xrc.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/xrc/xrc.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/xrc/xrc.bkl:2.1.5.1.4.1	Mon Sep 13 17:37:04 2004
+++ internal/wxPython-2.5/contrib/build/xrc/xrc.bkl	Tue Sep 14 17:56:47 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: xrc.bkl,v 2.1.5.1.4.1 2004/09/14 00:37:04 heikki Exp $ -->
+<!-- $Id: xrc.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:47 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_spin.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxSpinButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_spin.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_spin.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_bmpbt.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_bmpbt.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_bmpbt.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp:1.1.2.1 internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp:1.1.2.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp:1.1.2.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_tglbtn.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_tglbtn.cpp,v 1.1.2.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_tglbtn.cpp,v 1.1.2.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/ogldiag.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: ogldiag.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: ogldiag.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/Makefile.in
diff -u internal/wxPython-2.5/contrib/src/Makefile.in:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/Makefile.in:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/Makefile.in:2.1.5.1.4.1	Mon Sep 13 17:37:14 2004
+++ internal/wxPython-2.5/contrib/src/Makefile.in	Tue Sep 14 17:56:55 2004
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 2.1.5.1.4.1 2004/09/14 00:37:14 heikki Exp $
+# $Id: Makefile.in,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 
 CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg xrc deprecated animate #applet
 

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/proplist.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: proplist.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: proplist.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/antiflickpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas (@Lithuania)
 // Modified by:
 // Created:     23/10/98
-// RCS-ID:      $Id: antiflickpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: antiflickpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/stc/stc.bkl
diff -u internal/wxPython-2.5/contrib/build/stc/stc.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/stc/stc.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/stc/stc.bkl:2.1.5.1.4.1	Mon Sep 13 17:37:02 2004
+++ internal/wxPython-2.5/contrib/build/stc/stc.bkl	Tue Sep 14 17:56:45 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: stc.bkl,v 2.1.5.1.4.1 2004/09/14 00:37:02 heikki Exp $ -->
+<!-- $Id: stc.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:45 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/oglmisc.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: oglmisc.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: oglmisc.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/propframe.h	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: propframe.h,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: propframe.h,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_stlin.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxStaticLine
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_stlin.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_stlin.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/wxexpr.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: wxexpr.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: wxexpr.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h
diff -u internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/mmedia/sndfile.h	Tue Sep 14 17:56:51 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndfile.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// CVSID: $Id: sndfile.h,v 2.1.5.1.4.2 2004/09/15 00:56:51 davids Exp $
 // --------------------------------------------------------------------------
 #ifndef _WX_SNDFILE_H
 #define _WX_SNDFILE_H

Index: internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/wxexpr.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: wxexpr.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: wxexpr.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_menu.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for menus/menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_menu.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_menu.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/nodesdb.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: nodesdb.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: nodesdb.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/updatesmgr.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas (@Lithuania)
 // Modified by:
 // Created:     19/10/98
-// RCS-ID:      $Id: updatesmgr.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: updatesmgr.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/resource.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id: resource.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: resource.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_listc.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxListCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_listc.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_listc.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/hintanimpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     9/11/98
-// RCS-ID:      $Id: hintanimpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: hintanimpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_bmpbt.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_bmpbt.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_bmpbt.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h
diff -u internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h:2.1.5.1.4.1	Mon Sep 13 17:37:08 2004
+++ internal/wxPython-2.5/contrib/include/wx/gizmos/editlbox.h	Tue Sep 14 17:56:50 2004
@@ -2,7 +2,7 @@
 // Name:        editlbox.h
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id: editlbox.h,v 2.1.5.1.4.1 2004/09/14 00:37:08 heikki Exp $
+// RCS-ID:      $Id: editlbox.h,v 2.1.5.1.4.2 2004/09/15 00:56:50 davids Exp $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/resource.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/resource.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/resource.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/resource.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/resource.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: resource.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: resource.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/bmpshape.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: bmpshape.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: bmpshape.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndesd.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndesd.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndesd.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndesd.cpp"

Index: internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_scrol.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_scrol.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_scrol.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndcodec.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndcodec.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndcodec.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndcodec.cpp"

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbmp.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxStaticBitmap
 // Author:      Vaclav Slavik
 // Created:     2000/04/22
-// RCS-ID:      $Id: xh_stbmp.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_stbmp.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_unkwn.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for unkown widget
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_unkwn.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_unkwn.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_combo.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxRadioBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_combo.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_combo.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/barhintspl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     30/11/98 (my 22th birthday :-)
-// RCS-ID:      $Id: barhintspl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: barhintspl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/divided.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/divided.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/divided.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/divided.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/divided.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: divided.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: divided.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/basic.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/basic.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/basic.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/basic.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/basic.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: basic.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: basic.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/garbagec.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas (@Lithuania)
 // Modified by:
 // Created:     ??/10/98
-// RCS-ID:      $Id: garbagec.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: garbagec.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndmsad.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndmsad.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndmsad.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndmsad.cpp"

Index: internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp
diff -u internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:22 2004
+++ internal/wxPython-2.5/contrib/src/stc/ScintillaWX.cpp	Tue Sep 14 17:57:03 2004
@@ -9,7 +9,7 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
-// RCS-ID:      $Id: ScintillaWX.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:22 heikki Exp $
+// RCS-ID:      $Id: ScintillaWX.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:03 davids Exp $
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_sttxt.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxStaticText
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_sttxt.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_sttxt.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/pe_adv.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: pe_adv.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: pe_adv.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/bmpshape.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: bmpshape.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: bmpshape.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_listc.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_listc.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_listc.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_stbox.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/00
-// RCS-ID:      $Id: xh_stbox.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_stbox.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/xmlhelpr.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: xmlhelpr.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: xmlhelpr.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_chckb.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_chckb.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_chckb.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_stbmp.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxStaticBitmap
 // Author:      Vaclav Slavik
 // Created:     2000/04/22
-// RCS-ID:      $Id: xh_stbmp.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_stbmp.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_frame.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for dialogs
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_frame.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_frame.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/drawn.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/drawn.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/drawn.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/drawn.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/drawn.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: drawn.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: drawn.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_cald.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_cald.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_cald.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/propform.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: propform.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: propform.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/cbcustom.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: cbcustom.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: cbcustom.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/fldefs.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      David M. Falkinder (david_falkinder at hp.com)
 // Modified by:
 // Created:     18/09/2002
-// RCS-ID:      $Id: fldefs.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: fldefs.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) David M. Falkinder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_wizrd.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxWizard
 // Author:      Vaclav Slavik
 // Created:     2003/03/01
-// RCS-ID:      $Id: xh_wizrd.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_wizrd.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/plot/plot.bkl
diff -u internal/wxPython-2.5/contrib/build/plot/plot.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/plot/plot.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/plot/plot.bkl:2.1.5.1.4.1	Mon Sep 13 17:37:01 2004
+++ internal/wxPython-2.5/contrib/build/plot/plot.bkl	Tue Sep 14 17:56:45 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: plot.bkl,v 2.1.5.1.4.1 2004/09/14 00:37:01 heikki Exp $ -->
+<!-- $Id: plot.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:45 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/treelay.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     7/4/98
-// RCS-ID:      $Id: treelay.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: treelay.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_choic.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxChoice
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_choic.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_choic.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/propform.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/propform.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/propform.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/propform.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/propform.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: propform.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: propform.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/controlbar.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/controlbar.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/controlbar.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/controlbar.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/controlbar.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: controlbar.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: controlbar.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c
diff -u internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c	Tue Sep 14 17:56:57 2004
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /usr/local/cvsrep/internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+ * $Header: /usr/local/cvsrep/internal/wxPython-2.5/contrib/src/deprecated/cwlex_yy.c,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 

Index: internal/wxPython-2.5/contrib/include/wx/ogl/misc.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/misc.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/misc.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/misc.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/misc.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: misc.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: misc.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/newbmpbtn.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/09/98
-// RCS-ID:      $Id: newbmpbtn.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: newbmpbtn.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_unkwn.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for unknown widget
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_unkwn.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_unkwn.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/prop.h	Tue Sep 14 17:56:48 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: prop.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// RCS-ID:      $Id: prop.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/basic2.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/basic2.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/basic2.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/basic2.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/basic2.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: basic2.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: basic2.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/net/net.bkl
diff -u internal/wxPython-2.5/contrib/build/net/net.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/net/net.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/net/net.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:59 2004
+++ internal/wxPython-2.5/contrib/build/net/net.bkl	Tue Sep 14 17:56:43 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: net.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:59 heikki Exp $ -->
+<!-- $Id: net.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:43 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_stbox.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_stbox.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_stbox.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xmlres.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xmlres.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xmlres.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/newbmpbtn.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/09/98
-// RCS-ID:      $Id: newbmpbtn.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: newbmpbtn.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/canvas.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: canvas.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: canvas.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_gauge.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_gauge.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_gauge.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/applet/Makefile.in
diff -u internal/wxPython-2.5/contrib/src/applet/Makefile.in:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/applet/Makefile.in:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/applet/Makefile.in:2.1.5.1.4.1	Mon Sep 13 17:37:15 2004
+++ internal/wxPython-2.5/contrib/src/applet/Makefile.in	Tue Sep 14 17:56:57 2004
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 2.1.5.1.4.1 2004/09/14 00:37:15 heikki Exp $
+# $Id: Makefile.in,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 
 top_srcdir = @top_srcdir@/..
 top_builddir = ../../..

Index: internal/wxPython-2.5/contrib/include/wx/plot/plot.h
diff -u internal/wxPython-2.5/contrib/include/wx/plot/plot.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/plot/plot.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/plot/plot.h:2.1.5.1.4.1	Mon Sep 13 17:37:11 2004
+++ internal/wxPython-2.5/contrib/include/wx/plot/plot.h	Tue Sep 14 17:56:53 2004
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     12/1/2000
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id: plot.h,v 2.1.5.1.4.1 2004/09/14 00:37:11 heikki Exp $
+// RCS-ID:      $Id: plot.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

Index: internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_dlg.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for dialogs
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_dlg.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_dlg.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_slidr.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxSlider
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_slidr.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_slidr.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_bmp.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_bmp.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_bmp.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp
diff -u internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:17 2004
+++ internal/wxPython-2.5/contrib/src/fl/bardragpl.cpp	Tue Sep 14 17:56:58 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     23/09/98
-// RCS-ID:      $Id: bardragpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:17 heikki Exp $
+// RCS-ID:      $Id: bardragpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:58 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_scrol.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxScrollBar
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_scrol.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_scrol.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_split.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxSplitterWindow
 // Author:      panga at freemail.hu, Vaclav Slavik
 // Created:     2003/01/26
-// RCS-ID:      $Id: xh_split.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_split.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2003 panga at freemail.hu, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/net/email.h
diff -u internal/wxPython-2.5/contrib/include/wx/net/email.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/net/email.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/net/email.h:2.1.5.1.4.1	Mon Sep 13 17:37:09 2004
+++ internal/wxPython-2.5/contrib/include/wx/net/email.h	Tue Sep 14 17:56:52 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-08-21
-// RCS-ID:      $Id: email.h,v 2.1.5.1.4.1 2004/09/14 00:37:09 heikki Exp $
+// RCS-ID:      $Id: email.h,v 2.1.5.1.4.2 2004/09/15 00:56:52 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_radbt.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxRadioButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_radbt.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_radbt.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndg72x.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndg72x.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndg72x.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndg72x.cpp"

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_tree.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_tree.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_tree.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/ogl.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: ogl.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: ogl.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_spin.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxSpinButton
 // Author:      Bob Mitchell
 // Created:     2000/03/21
-// RCS-ID:      $Id: xh_spin.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_spin.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/dynbarhnd.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     23/01/99
-// RCS-ID:      $Id: dynbarhnd.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: dynbarhnd.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/drawnp.h	Tue Sep 14 17:56:53 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: drawnp.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: drawnp.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/panedrawpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas <mailto:alex at soften.ktu.lt>
 // Modified by:
 // Created:     06/09/98
-// RCS-ID:      $Id: panedrawpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: panedrawpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/svg/svg.bkl
diff -u internal/wxPython-2.5/contrib/build/svg/svg.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/svg/svg.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/svg/svg.bkl:2.1.5.1.4.1	Mon Sep 13 17:37:02 2004
+++ internal/wxPython-2.5/contrib/build/svg/svg.bkl	Tue Sep 14 17:56:46 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: svg.bkl,v 2.1.5.1.4.1 2004/09/14 00:37:02 heikki Exp $ -->
+<!-- $Id: svg.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:46 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/rowdragpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     06/10/98
-// RCS-ID:      $Id: rowdragpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: rowdragpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl
diff -u internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl:2.1.5.1.4.1 internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl:2.1.5.1.4.1	Mon Sep 13 17:36:58 2004
+++ internal/wxPython-2.5/contrib/build/mmedia/mmedia.bkl	Tue Sep 14 17:56:42 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: mmedia.bkl,v 2.1.5.1.4.1 2004/09/14 00:36:58 heikki Exp $ -->
+<!-- $Id: mmedia.bkl,v 2.1.5.1.4.2 2004/09/15 00:56:42 davids Exp $ -->
 
 <makefile>
 

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_toolb.h	Tue Sep 14 17:56:55 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
-// RCS-ID:      $Id: xh_toolb.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_toolb.h,v 2.1.5.1.4.2 2004/09/15 00:56:55 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/propedit.cpp	Tue Sep 14 17:57:08 2004
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: propedit.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: propedit.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndcpcm.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999, 2000
-// CVSID: $Id: sndcpcm.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndcpcm.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndcpcm.cpp"

Index: internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_scwin.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxScrolledWindow
 // Author:      Vaclav Slavik
 // Created:     2002/10/18
-// RCS-ID:      $Id: xh_scwin.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_scwin.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h
diff -u internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h:2.1.5.1.4.1	Mon Sep 13 17:37:08 2004
+++ internal/wxPython-2.5/contrib/include/wx/gizmos/dynamicsash.h	Tue Sep 14 17:56:50 2004
@@ -5,7 +5,7 @@
 // Author:      Matt Kimball
 // Modified by:
 // Created:     7/15/2001
-// RCS-ID:      $Id: dynamicsash.h,v 2.1.5.1.4.1 2004/09/14 00:37:08 heikki Exp $
+// RCS-ID:      $Id: dynamicsash.h,v 2.1.5.1.4.2 2004/09/15 00:56:50 davids Exp $
 // Copyright:   (c) 2001 Matt Kimball
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_tree.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxTreeCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_tree.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_tree.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp
diff -u internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:21 2004
+++ internal/wxPython-2.5/contrib/src/ogl/mfutils.cpp	Tue Sep 14 17:57:02 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: mfutils.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:21 heikki Exp $
+// RCS-ID:      $Id: mfutils.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:02 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_cald.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxCalendarCtrl
 // Author:      Brian Gavin
 // Created:     2000/09/09
-// RCS-ID:      $Id: xh_cald.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_cald.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/hintanimpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     9/11/98
-// RCS-ID:      $Id: hintanimpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: hintanimpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/bardragpl.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     23/09/98
-// RCS-ID:      $Id: bardragpl.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: bardragpl.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp
diff -u internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:19 2004
+++ internal/wxPython-2.5/contrib/src/mmedia/sndaiff.cpp	Tue Sep 14 17:57:00 2004
@@ -3,7 +3,7 @@
 // Purpose:
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux at easynet.fr> (C) 1999
-// CVSID: $Id: sndaiff.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:19 heikki Exp $
+// CVSID: $Id: sndaiff.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:00 davids Exp $
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndaiff.cpp"

Index: internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp
diff -u internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:16 2004
+++ internal/wxPython-2.5/contrib/src/deprecated/tbarsmpl.cpp	Tue Sep 14 17:56:57 2004
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
 // Created:     04/01/98
-// RCS-ID:      $Id: tbarsmpl.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:16 heikki Exp $
+// RCS-ID:      $Id: tbarsmpl.cpp,v 2.1.5.1.4.2 2004/09/15 00:56:57 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h
diff -u internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h:2.1.5.1.4.1	Mon Sep 13 17:37:13 2004
+++ internal/wxPython-2.5/contrib/include/wx/xrc/xh_gdctl.h	Tue Sep 14 17:56:54 2004
@@ -3,7 +3,7 @@
 // Purpose:     XML resource handler for wxGenericDirCtrl
 // Author:      Markus Greither
 // Created:     2002/01/20
-// RCS-ID:      $Id: xh_gdctl.h,v 2.1.5.1.4.1 2004/09/14 00:37:13 heikki Exp $
+// RCS-ID:      $Id: xh_gdctl.h,v 2.1.5.1.4.2 2004/09/15 00:56:54 davids Exp $
 // Copyright:   (c) 2002 Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h
diff -u internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h:2.1.5.1.4.1	Mon Sep 13 17:37:06 2004
+++ internal/wxPython-2.5/contrib/include/wx/fl/dyntbar.h	Tue Sep 14 17:56:49 2004
@@ -4,7 +4,7 @@
 // Author:      Aleksandras Gluchovas
 // Modified by:
 // Created:     ??/10/98
-// RCS-ID:      $Id: dyntbar.h,v 2.1.5.1.4.1 2004/09/14 00:37:06 heikki Exp $
+// RCS-ID:      $Id: dyntbar.h,v 2.1.5.1.4.2 2004/09/15 00:56:49 davids Exp $
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h
diff -u internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h:2.1.5.1.4.1	Mon Sep 13 17:37:10 2004
+++ internal/wxPython-2.5/contrib/include/wx/ogl/mfutils.h	Tue Sep 14 17:56:53 2004
@@ -5,7 +5,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
-// RCS-ID:      $Id: mfutils.h,v 2.1.5.1.4.1 2004/09/14 00:37:10 heikki Exp $
+// RCS-ID:      $Id: mfutils.h,v 2.1.5.1.4.2 2004/09/15 00:56:53 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp
diff -u internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:28 2004
+++ internal/wxPython-2.5/contrib/utils/wxrcedit/edapp.cpp	Tue Sep 14 17:57:08 2004
@@ -2,7 +2,7 @@
 // Purpose:     XML resources editor
 // Author:      Vaclav Slavik
 // Created:     2000/05/05
-// RCS-ID:      $Id: edapp.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:28 heikki Exp $
+// RCS-ID:      $Id: edapp.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:08 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_bttn.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xh_bttn.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_bttn.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xh_toolb.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resource for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
-// RCS-ID:      $Id: xh_toolb.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xh_toolb.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

Index: internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp
diff -u internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp:2.1.5.1.4.1 internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp:2.1.5.1.4.1	Mon Sep 13 17:37:25 2004
+++ internal/wxPython-2.5/contrib/src/xrc/xmlres.cpp	Tue Sep 14 17:57:05 2004
@@ -3,7 +3,7 @@
 // Purpose:     XRC resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: xmlres.cpp,v 2.1.5.1.4.1 2004/09/14 00:37:25 heikki Exp $
+// RCS-ID:      $Id: xmlres.cpp,v 2.1.5.1.4.2 2004/09/15 00:57:05 davids Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1285,20 +1285,107 @@
 {
 #define stdID(id) XRCID_Lookup(wxT(#id), id)
     stdID(-1);
-    stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);
-    stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT);
-    stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
-    stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
-    stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
-    stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
-    stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
-    stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
-    stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
-    stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
-    stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
-    stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
-    stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
+
+    stdID(wxID_ANY);
+    stdID(wxID_SEPARATOR);
+    
+    stdID(wxID_OPEN);
+    stdID(wxID_CLOSE);
+    stdID(wxID_NEW);
+    stdID(wxID_SAVE);
+    stdID(wxID_SAVEAS);
+    stdID(wxID_REVERT);
+    stdID(wxID_EXIT);
+    stdID(wxID_UNDO);
+    stdID(wxID_REDO);
+    stdID(wxID_HELP);
+    stdID(wxID_PRINT);
+    stdID(wxID_PRINT_SETUP);
+    stdID(wxID_PREVIEW);
+    stdID(wxID_ABOUT);
+    stdID(wxID_HELP_CONTENTS);
+    stdID(wxID_HELP_COMMANDS);
+    stdID(wxID_HELP_PROCEDURES);
+    stdID(wxID_HELP_CONTEXT);
     stdID(wxID_CLOSE_ALL);
+    stdID(wxID_PREFERENCES);
+    stdID(wxID_CUT);
+    stdID(wxID_COPY);
+    stdID(wxID_PASTE);
+    stdID(wxID_CLEAR);
+    stdID(wxID_FIND);
+    stdID(wxID_DUPLICATE);
+    stdID(wxID_SELECTALL);
+    stdID(wxID_DELETE);
+    stdID(wxID_REPLACE);
+    stdID(wxID_REPLACE_ALL);
+    stdID(wxID_PROPERTIES);
+    stdID(wxID_VIEW_DETAILS);
+    stdID(wxID_VIEW_LARGEICONS);
+    stdID(wxID_VIEW_SMALLICONS);
+    stdID(wxID_VIEW_LIST);
+    stdID(wxID_VIEW_SORTDATE);
+    stdID(wxID_VIEW_SORTNAME);
+    stdID(wxID_VIEW_SORTSIZE);
+    stdID(wxID_VIEW_SORTTYPE);
+    stdID(wxID_FILE1);
+    stdID(wxID_FILE2);
+    stdID(wxID_FILE3);
+    stdID(wxID_FILE4);
+    stdID(wxID_FILE5);
+    stdID(wxID_FILE6);
+    stdID(wxID_FILE7);
+    stdID(wxID_FILE8);
+    stdID(wxID_FILE9);
+    stdID(wxID_OK);
+    stdID(wxID_CANCEL);
+    stdID(wxID_APPLY);
+    stdID(wxID_YES);
+    stdID(wxID_NO);
+    stdID(wxID_STATIC);
+    stdID(wxID_FORWARD);
+    stdID(wxID_BACKWARD);
+    stdID(wxID_DEFAULT);
+    stdID(wxID_MORE);
+    stdID(wxID_SETUP);
+    stdID(wxID_RESET);
+    stdID(wxID_CONTEXT_HELP);
+    stdID(wxID_YESTOALL);
+    stdID(wxID_NOTOALL);
+    stdID(wxID_ABORT);
+    stdID(wxID_RETRY);
+    stdID(wxID_IGNORE);
+    stdID(wxID_ADD);
+    stdID(wxID_REMOVE);
+    stdID(wxID_UP);
+    stdID(wxID_DOWN);
+    stdID(wxID_HOME);
+    stdID(wxID_REFRESH);
+    stdID(wxID_STOP);
+    stdID(wxID_INDEX);
+    stdID(wxID_BOLD);
+    stdID(wxID_ITALIC);
+    stdID(wxID_JUSTIFY_CENTER);
+    stdID(wxID_JUSTIFY_FILL);
+    stdID(wxID_JUSTIFY_RIGHT);
+    stdID(wxID_JUSTIFY_LEFT);
+    stdID(wxID_UNDERLINE);
+    stdID(wxID_INDENT);
+    stdID(wxID_UNINDENT);
+    stdID(wxID_ZOOM_100);
+    stdID(wxID_ZOOM_FIT);
+    stdID(wxID_ZOOM_IN);
+    stdID(wxID_ZOOM_OUT);
+    stdID(wxID_UNDELETE);
+    stdID(wxID_REVERT_TO_SAVED);
+    stdID(wxID_SYSTEM_MENU);
+    stdID(wxID_CLOSE_FRAME);
+    stdID(wxID_MOVE_FRAME);
+    stdID(wxID_RESIZE_FRAME);
+    stdID(wxID_MAXIMIZE_FRAME);
+    stdID(wxID_ICONIZE_FRAME);
+    stdID(wxID_RESTORE_FRAME);
+
 #undef stdID
 }
 

Index: internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h
diff -u internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h:2.1.5.1.4.1 internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h:2.1.5.1.4.2
--- internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h:2.1.5.1.4.1	Mon Sep 13 17:37:05 2004
+++ internal/wxPython-2.5/contrib/include/wx/deprecated/setup.h	Tue Sep 14 17:56:48 2004
@@ -1,1097 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
+// Name:        wx/deprecated/setup.h
+// Purpose:     Configuration for deprecated features of the library
 // Author:      Julian Smart
 // Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id: setup.h,v 2.1.5.1.4.1 2004/09/14 00:37:05 heikki Exp $
+// Created:     2003-03-30
+// RCS-ID:      $Id: setup.h,v 2.1.5.1.4.2 2004/09/15 00:56:48 davids Exp $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
+#ifndef _WX_DEPRECATED_SETUP_H_
+#define _WX_DEPRECATED_SETUP_H_
 
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.2 API: set it to 1 to
-// enable it but please consider updating your code instead.
-//
-// Default is 0
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_2 0
-
-// This setting determines the compatibility with 2.4 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_4 1
-
-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
-// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
-// If migrating between versions, your dialogs may seem to shrink.
-//
-// Default is 1
-//
-// Recommended setting: 0 (the new calculations are more correct!)
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWindows memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug mode
-// (__WXDEBUG__) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 1
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
+// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
+// the same as wxDateTime!). These classes are obsolete and shouldn't be used
+// in new code
 //
 // Default is 0
 //
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 1
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for mingw / cygwin / CodeWarrior
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#ifdef _MSC_VER
-    #define wxUSE_ON_FATAL_EXCEPTION 1
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
+// Recommended setting: 0 unless you have legacy code which uses these classes
+#ifdef wxUSE_TIMEDATE
+#undef wxUSE_TIMEDATE
 #endif
 
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
+#define wxUSE_TIMEDATE 0
 
-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
-// defined as wchar_t, wxString will use Unicode internally. If you set this
-// to 1, you must use wxT() macro for all literal strings in the program.
-//
-// Unicode is currently only fully supported under Windows NT/2000/XP
-// (Windows 9x doesn't support it and the programs compiled in Unicode mode
-// will not run under 9x -- but see wxUSE_UNICODE_MSLU below).
-//
-// Default is 0
-//
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
+// wxProperty[Value/Form/List] classes, used by Dialog Editor
+#ifdef wxUSE_PROPSHEET
+#undef wxUSE_PROPSHEET
 #endif
+#define wxUSE_PROPSHEET    1
 
-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
-// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#define wxUSE_UNICODE_MSLU 0
-
-// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
-// compiling the program in Unicode mode. More precisely, it will be possible
-// to construct wxString from a wide (Unicode) string and convert any wxString
-// to Unicode.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_EXTENDED_RTTI 0
-
-#if defined(__BORLANDC__)
-#undef wxUSE_EXTENDED_RTTI
-#define wxUSE_EXTENDED_RTTI 1
+// wxTreeLayout class
+#ifdef wxUSE_TREELAYOUT
+#undef wxUSE_TREELAYOUT
 #endif
+#define wxUSE_TREELAYOUT     1
 
-// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
-// std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
-// and for wxHashMap to be implemented with templates.
-//
-// Default is 0
-//
-// Recommended setting: YMMV
-#define wxUSE_STL 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// This is ignored under Win16, threads are only supported under Win32.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled (1), compiles wxWindows streams classes
-#define wxUSE_STREAMS       1
-
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
-#define wxUSE_STD_IOSTREAM  0
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   0
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG and wxUSE_GZSTREAM.
-#define wxUSE_ZLIB          1
-
-// Set to 1 to compile wxGzipInput/OutputStream classes. Requires wxUSE_ZLIB.
-#define wxUSE_GZSTREAM      1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by XRC)
-#define wxUSE_XML       1
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWindows control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_BUTTON       1    // wxButton
-#define wxUSE_BMPBUTTON    1    // wxBitmapButton
-#define wxUSE_CALENDARCTRL 1    // wxCalendarCtrl
-#define wxUSE_CHECKBOX     1    // wxCheckBox
-#define wxUSE_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE       1    // wxChoice
-#define wxUSE_COMBOBOX     1    // wxComboBox
-#define wxUSE_GAUGE        1    // wxGauge
-#define wxUSE_LISTBOX      1    // wxListBox
-#define wxUSE_LISTCTRL     1    // wxListCtrl
-#define wxUSE_RADIOBOX     1    // wxRadioBox
-#define wxUSE_RADIOBTN     1    // wxRadioButton
-#define wxUSE_SCROLLBAR    1    // wxScrollBar
-#define wxUSE_SLIDER       1    // wxSlider
-#define wxUSE_SPINBTN      1    // wxSpinButton
-#define wxUSE_SPINCTRL     1    // wxSpinCtrl
-#define wxUSE_STATBOX      1    // wxStaticBox
-#define wxUSE_STATLINE     1    // wxStaticLine
-#define wxUSE_STATTEXT     1    // wxStaticText
-#define wxUSE_STATBMP      1    // wxStaticBitmap
-#define wxUSE_TEXTCTRL     1    // wxTextCtrl
-#define wxUSE_TOGGLEBTN    1    // requires wxButton
-#define wxUSE_TREECTRL     1    // wxTreeCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// this setting is obsolete, value is ignored
-#define wxUSE_BUTTONBAR    1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used ot logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxTabDialog is a generic version of wxNotebook but it is incompatible with
-// the new class. It shouldn't be used in new code.
-//
-// Default is 0.
-//
-// Recommended setting: 0 (use wxNotebook)
-#define wxUSE_TAB_DIALOG    0
-
-// wxGrid class
-//
-// Default is 1 for both options.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// working with them.
-//
-// Default is 0 because it isn't yet implemented on all platforms
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// wxDC cacheing implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable the use of DIB's for wxBitmap to support
-// bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
-#define wxUSE_DIB_FOR_BITMAP 0
-
-// Set this to 1 to enable wxDIB
-#define wxUSE_WXDIB 1
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// Define 1 to use generic dialogs in Windows, even though they duplicate
-// native common dialog (e.g. wxColourDialog). This is mainly useful for
-// testing.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable MDI document/view architecture
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1. Note that for some compilers (notably Microsoft Visual C++) you
-// will need to manually add opengl32.lib and glu32.lib to the list of
-// libraries linked with your program if you use OpenGL.
-//
-// Default is 0.
-//
-// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#define wxUSE_GLCANVAS       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running (it is only available under Win32)
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-#define wxUSE_MS_HTML_HELP 1
-                                // 0 for no MS HTML Help
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_RESOURCES   1
-                                // 0 for no wxGetResource/wxWriteResource
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// ----------------------------------------------------------------------------
-// postscript support settings
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  1
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 0
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS	 1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-// ----------------------------------------------------------------------------
-// other compiler (mis)features
-// ----------------------------------------------------------------------------
-
-// Set this to 0 if your compiler can't cope with omission of prototype
-// parameters.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (should never need to set this to 0)
-#define REMOVE_UNUSED_ARG   1
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set to 1 for <iostream.h>, 0 for <iostream>. Note that VC++ 7.1
-// and later doesn't support wxUSE_IOSTREAMH == 1 and so <iostream> will be
-// used anyhow.
-//
-// Default is 1.
-//
-// Recommended setting: whatever your compiler likes more
-#define wxUSE_IOSTREAMH     1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_CTL3D                      0
-#else
-#define wxUSE_CTL3D                      1
+// use wxExpr (a.k.a. PrologIO)
+#ifdef wxUSE_PROLOGIO
+#undef wxUSE_PROLOGIO
 #endif
+#define wxUSE_PROLOGIO          1
 
-// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
-// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
-// miniframes support instead.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-#define wxUSE_ITSY_BITSY             0
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT  1
-
-// TODO:  This should be ifdef'ed for any compilers that don't support
-//        RichEdit 2.0 but do have RichEdit 1.0...
-#define wxUSE_RICHEDIT2 1
-
-#else
-#define wxUSE_RICHEDIT  0
-#define wxUSE_RICHEDIT2 0
+// Use .wxr resource mechanism (requires PrologIO library)
+#ifdef wxUSE_WX_RESOURCES
+#undef wxUSE_WX_RESOURCES
 #endif
+#define wxUSE_WX_RESOURCES      1
 
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to auto-adapt to MS Windows XP themes where possible
-// (notably, wxNotebook pages)
-#define wxUSE_UXTHEME_AUTO      1
-
-// Set to 1 to if you're developing for MS SmartPhone
-#define wxUSE_SMARTPHONE        0
-
-// ----------------------------------------------------------------------------
-// obsolete settings
-// ----------------------------------------------------------------------------
-
-// NB: all settings in this section are obsolete and should not be used/changed
-//     at all, they will disappear
-
-// Set to 1 to use PenWindows
-#define wxUSE_PENWINDOWS             0
+// Use simple, generic toolbar
+#ifdef wxUSE_TOOLBAR_SIMPLE
+#undef wxUSE_TOOLBAR_SIMPLE
+#endif
+#define wxUSE_TOOLBAR_SIMPLE 1
 
-// Define 1 to use bitmap messages.
-#define wxUSE_BITMAP_MESSAGE         1
 
-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES     1
+#ifdef WXMAKINGDLL_DEPRECATED
+    #define WXDLLIMPEXP_DEPRECATED WXEXPORT
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_DEPRECATED WXIMPORT
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_DEPRECATED
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) type
+#endif
 
 #endif
-    // _WX_SETUP_H_
+    // _WX_DEPRECATED_SETUP_H_



More information about the Commits mailing list