5 files changed, 290 insertions, 23 deletions

diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index f34edb1df770..573309d64b00 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	wxPython
-PORTVERSION=	2.3.2.1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wxpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.ORG
 
 LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython
+
 WX_CONFIG=	${X11BASE}/bin/wx-config
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo
index 1d63de40558e..295b0a52379e 100644
--- a/x11-toolkits/py-wxPython/distinfo
+++ b/x11-toolkits/py-wxPython/distinfo
@@ -1 +1 @@
-MD5 (wxPython-2.3.2.1.tar.gz) = e57b4d030c4ba43a9030fdaee083011c
+MD5 (wxPythonSrc-2.4.0.1.tar.gz) = 1eb8149cb76fd2a4bf5f0c51dc08c2f4
diff --git a/x11-toolkits/py-wxPython/files/patch-aa b/x11-toolkits/py-wxPython/files/patch-aa
index e077be34f491..83c29fac7d00 100644
--- a/x11-toolkits/py-wxPython/files/patch-aa
+++ b/x11-toolkits/py-wxPython/files/patch-aa
@@ -1,5 +1,5 @@
---- contrib/stc/contrib/src/stc/ScintillaWX.h	2000/12/08 13:24:39	1.1
-+++ contrib/stc/contrib/src/stc/ScintillaWX.h	2000/12/08 13:25:18
+--- ../contrib/src/stc/ScintillaWX.h	2000/12/08 13:24:39	1.1
++++ ../contrib/src/stc/ScintillaWX.h	2000/12/08 13:25:18
 @@ -41,6 +41,7 @@
  #include "Document.h"
  #include "Editor.h"
diff --git a/x11-toolkits/py-wxPython/files/patch-ac b/x11-toolkits/py-wxPython/files/patch-ac
index 9a5a4b1b76e0..50b41c1437fb 100644
--- a/x11-toolkits/py-wxPython/files/patch-ac
+++ b/x11-toolkits/py-wxPython/files/patch-ac
@@ -1,6 +1,9 @@
---- setup.py.orig	Thu Dec 20 18:33:42 2001
-+++ setup.py	Sun Jan 20 11:00:24 2002
-@@ -111,6 +111,16 @@
+
+$FreeBSD$
+
+--- setup.py.orig	Fri Jan 10 06:24:53 2003
++++ setup.py	Tue Jan 14 21:02:25 2003
+@@ -159,6 +159,16 @@
  
  
  #----------------------------------------------------------------------
@@ -17,15 +20,92 @@
  # Check for build flags on the command line
  #----------------------------------------------------------------------
  
-@@ -277,9 +287,10 @@
+@@ -382,7 +392,7 @@
+ 
+     if WXPORT == 'gtk':
+         WXPLAT = '__WXGTK__'
+-        portcfg = os.popen('gtk-config --cflags', 'r').read()[:-1]
++        portcfg = os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
+     elif WXPORT == 'gtk2':
+         WXPLAT = '__WXGTK__'
+         GENDIR = 'gtk' # no code differences so use the same generated sources
+@@ -402,6 +412,7 @@
                 ]
      libdirs = []
      libs = []
 +    libs.extend(sys_libs)
  
-     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
--             os.popen('gtk-config --cflags', 'r').read()[:-1]
-+             os.popen(gtk_config + ' --cflags', 'r').read()[:-1]
-     cflags = string.split(cflags)
+     Verify_WX_CONFIG()
+ 
+@@ -633,8 +644,8 @@
+ if not GL_ONLY and BUILD_OGL:
+     msg('Preparing OGL...')
+     location = 'contrib/ogl'
+-    OGLLOC = opj(location, 'contrib/src/ogl')
+-    OGLINC = opj(location, 'contrib/include')
++    OGLLOC = opj(location, '../../../contrib/src/ogl')
++    OGLINC = opj(location, '../../../contrib/include')
+ 
+     swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
+                   'oglcanvas.i']
+@@ -682,9 +693,9 @@
+ if not GL_ONLY and BUILD_STC:
+     msg('Preparing STC...')
+     location = 'contrib/stc'
+-    STCLOC = opj(location, 'contrib/src/stc')
+-    STCINC = opj(location, 'contrib/include')
+-    STC_H =  opj(location, 'contrib/include/wx/stc')
++    STCLOC = opj(location, '../../../contrib/src/stc')
++    STCINC = opj(location, '../../../contrib/include')
++    STC_H =  opj(location, '../../../contrib/include/wx/stc')
+ 
+     if IN_CVS_TREE:
+         # Check if gen_iface needs to be run for the wxSTC sources
+@@ -826,8 +837,8 @@
+ if not GL_ONLY and BUILD_XRC:
+     msg('Preparing XRC...')
+     location = 'contrib/xrc'
+-    XMLLOC = opj(location, 'contrib/src/xrc')
+-    XMLINC = opj(location, 'contrib/include')
++    XMLLOC = opj(location, '../../../contrib/src/xrc')
++    XMLINC = opj(location, '../../../contrib/include')
+ 
+     swig_files = ['xrc.i']
+ 
+@@ -915,8 +926,8 @@
+ if not GL_ONLY and BUILD_GIZMOS:
+     msg('Preparing GIZMOS...')
+     location = 'contrib/gizmos'
+-    GIZMOLOC = opj(location, 'contrib/src/gizmos')
+-    GIZMOINC = opj(location, 'contrib/include')
++    GIZMOLOC = opj(location, '../../../contrib/src/gizmos')
++    GIZMOINC = opj(location, '../../../contrib/include')
+ 
+     swig_files = ['gizmos.i']
+ 
+@@ -993,8 +1004,8 @@
+ if not GL_ONLY and BUILD_CANVAS:
+     msg('Preparing CANVAS...')
+     location = 'contrib/canvas'
+-    CANVASLOC = opj(location, 'contrib/src/canvas')
+-    CANVASINC = opj(location, 'contrib/include')
++    CANVASLOC = opj(location, '../../../contrib/src/canvas')
++    CANVASINC = opj(location, '../../../contrib/include')
+ 
+     swig_files = ['canvas.i']
+ 
+@@ -1032,10 +1043,10 @@
+ if not GL_ONLY and BUILD_ART2D:
+     msg('Preparing ART2D...')
+     location = 'contrib/art2d'
+-    ART2DLOC = opj(location, 'modules/canvas/src')
+-    ART2DINC = opj(location, 'modules/canvas/include')
+-    EXPATLOC = opj(location, 'modules/expat')
+-    EXPATINC = opj(location, 'modules/expat/include')
++    ART2DLOC = opj(location, '../../../modules/canvas/src')
++    ART2DINC = opj(location, '../../../modules/canvas/include')
++    EXPATLOC = opj(location, '../../../modules/expat')
++    EXPATINC = opj(location, '../../../modules/expat/include')
  
-     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+     swig_files = ['art2d.i',
+                   'art2d_misc.i',
diff --git a/x11-toolkits/py-wxPython/pkg-plist b/x11-toolkits/py-wxPython/pkg-plist
index 6d324dfb07fe..463350ef4f68 100644
--- a/x11-toolkits/py-wxPython/pkg-plist
+++ b/x11-toolkits/py-wxPython/pkg-plist
@@ -44,6 +44,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/DrawXXXList.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/ErrorDialogs.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/EventManager.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/EventManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FancyText.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/FileBrowseButton.py
@@ -56,6 +58,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridCustEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridCustTable.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridCustTable.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/GridDragable.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/GridDragable.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridEnterHandler.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridEnterHandler.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/GridHugeTable.py
@@ -86,6 +90,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PyCrustWithFilling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/PythonEvents.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RowColSizer.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/RowColSizer.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ScrolledPanel.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/ScrolledPanel.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Sizers.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/SlashDot.py
@@ -96,23 +104,51 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/TablePrint.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/Threads.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Throbber.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Throbber.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/URLDragAndDrop.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/VirtualListCtrl.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/XML_Resource.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Unicode.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/Unicode.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/XMLtreeview.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/image.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/noicon.png
-%%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/robin.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/smiles.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps/splash.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/001.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/002.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/003.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/004.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/005.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/006.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/007.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/008.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/009.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/010.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/011.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/012.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/013.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/014.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/015.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/016.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/017.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/018.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/019.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/01c.gif
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/020.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/021.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/022.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/023.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/024.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/025.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/026.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/027.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/028.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/029.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/030.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/10s.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/12h.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/13d.gif
@@ -125,6 +161,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/Pt.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/backgrnd.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/copy.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/eclouds.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/file2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder1.bmp
@@ -132,10 +169,14 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/folder3.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/lb2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/logo.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/mondrian.ico
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/new.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/noicon.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/open.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/paste.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/rest.png
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/robin.jpg
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_down.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/sm_up.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/smiles.bmp
@@ -145,6 +186,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/teststar.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog1.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/tog2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest1.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source/wiztest2.bmp
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/anykey.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/echo.pyc
@@ -153,6 +196,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/imagemap.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic.png
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.bmp
+%%PYTHON_SITELIBDIR%%/wxPython/demo/data/pic2.gif
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/plan.wav
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource.wdr
 %%PYTHON_SITELIBDIR%%/wxPython/demo/data/resource_wdr.xrc
@@ -165,6 +209,7 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demo.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/demoMainLoop.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/encode_bitmaps.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/encode_bitmaps.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/hangman.py
@@ -185,12 +230,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/run.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/simple.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/simple.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/template.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/template.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/throbImages.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/viewer_basics.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/widgetTest.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/widgetTest.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxArtProvider.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxArtProvider.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxButton.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxButton.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxCalendar.py
@@ -221,6 +272,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxEditor.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileHistory.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxFileHistory.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFindReplaceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxFloatBar.py
@@ -233,14 +286,22 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxGLCanvas.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxGauge.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxGauge.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxGenericDirCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxGenericDirCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxGrid.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxGrid.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxHtmlWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxHtmlWindow.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIEHtmlWin.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxIEHtmlWin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxImage.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxImageFromStream.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxJoystick.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxKeyEvents.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLEDNumberCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxLayoutConstraints.py
@@ -249,16 +310,24 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListBox.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxListCtrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxListCtrl_virtual.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxListCtrl_virtual.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMDIWindows.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMDIWindows.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMVCTree.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMVCTree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMask.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMenu.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMenu.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMessageDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMimeTypesManager.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMiniFrame.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultiSash.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultiSash.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxMultipleChoiceDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxNotebook.py
@@ -269,6 +338,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPageSetupDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPlotCanvas.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupControl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupControl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPopupWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxPrintDialog.py
@@ -279,6 +350,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioBox.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxRadioButton.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxRightTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxSashWindow.py
@@ -311,6 +384,8 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTextCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTextEntryDialog.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTextEntryDialog.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxTimeCtrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxTimeCtrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTimer.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTimer.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxToggleButton.py
@@ -319,12 +394,16 @@
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxToolBar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTreeCtrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxTreeCtrl.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/demo/wxVTKRenderWindow.py
-%%PYTHON_SITELIBDIR%%/wxPython/demo/wxVTKRenderWindow.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxValidator.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.py
 %%PYTHON_SITELIBDIR%%/wxPython/demo/wxWave.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxWizard.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxWizard.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxXmlResource.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxXmlResource.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxXmlResourceHandler.py
+%%PYTHON_SITELIBDIR%%/wxPython/demo/wxXmlResourceHandler.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/dllwidget.py
 %%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/dllwidget.pyo
@@ -338,6 +417,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/filesys.py
 %%PYTHON_SITELIBDIR%%/wxPython/filesys.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/filesys.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/fonts.py
+%%PYTHON_SITELIBDIR%%/wxPython/fonts.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/fonts.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/frames.py
 %%PYTHON_SITELIBDIR%%/wxPython/frames.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/frames.pyo
@@ -400,6 +482,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/filling.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/images.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/interpreter.pyo
@@ -412,6 +497,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shellmenu.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shellmenu.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/shellmenu.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust/version.pyo
@@ -454,6 +542,9 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/editor/selection.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/evtmgr.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/evtmgr.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/evtmgr.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/fancytext.pyo
@@ -463,12 +554,18 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/floatbar.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/floatbar.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/floatbar.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/gridmovers.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/gridmovers.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/gridmovers.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/grids.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/grids.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/grids.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/imagebrowser.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/imagebrowser.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/imagebrowser.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/imageutils.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/imageutils.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/imageutils.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/infoframe.pyo
@@ -487,27 +584,54 @@
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/listctrl.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/rubberband.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/rubberband.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/mixins/rubberband.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/multisash.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/multisash.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/multisash.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/mvctree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/popupctl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/popupctl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/popupctl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/printout.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/printout.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/pubsub.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/pubsub.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/pubsub.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/pyshell.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rcsizer.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rcsizer.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/rcsizer.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rightalign.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/rpcMixin.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/sheet.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/sheet.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/sheet.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/shell.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/shell.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/shell.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/splashscreen.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/splashscreen.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/splashscreen.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/stattext.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/stattext.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/stattext.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/throbber.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/throbber.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/throbber.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/lib/timectrl.py
+%%PYTHON_SITELIBDIR%%/wxPython/lib/timectrl.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/lib/timectrl.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/lib/vtk.py
 %%PYTHON_SITELIBDIR%%/wxPython/lib/vtk.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/lib/vtk.pyo
@@ -561,10 +685,57 @@
 %%PYTHON_SITELIBDIR%%/wxPython/streams.py
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/streams.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/encode_bitmaps.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/encode_bitmaps.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/encode_bitmaps.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/globals.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/globals.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/globals.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/images.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/panel.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/params.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/tree.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/undo.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/undo.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/undo.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xrced.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed/xxx.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/helpviewer.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2img.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2img.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2img.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2png.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2png.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2png.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2py.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2py.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2py.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2xpm.py
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2xpm.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/tools/img2xpm.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/utils.py
 %%PYTHON_SITELIBDIR%%/wxPython/utils.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/utils.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/utilsc.so
 %%PYTHON_SITELIBDIR%%/wxPython/windows.py
 %%PYTHON_SITELIBDIR%%/wxPython/windows.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/windows.pyo
@@ -574,6 +745,10 @@
 %%PYTHON_SITELIBDIR%%/wxPython/windows3.py
 %%PYTHON_SITELIBDIR%%/wxPython/windows3.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/windows3.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/wizard.py
+%%PYTHON_SITELIBDIR%%/wxPython/wizard.pyc
+%%PYTHON_SITELIBDIR%%/wxPython/wizard.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/wizardc.so
 %%PYTHON_SITELIBDIR%%/wxPython/wx.py
 %%PYTHON_SITELIBDIR%%/wxPython/wx.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/wx.pyo
@@ -582,8 +757,17 @@
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyc
 %%PYTHON_SITELIBDIR%%/wxPython/xrc.pyo
 %%PYTHON_SITELIBDIR%%/wxPython/xrcc.so
-@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
+bin/helpviewer
+bin/img2png
+bin/img2py
+bin/img2xpm
+bin/pycrust
+bin/pyshell
+bin/xrced
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools/XRCed
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/tools
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/mixins
+@dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/editor
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib/PyCrust
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/lib
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/data