add wx.html, more modules in wx.adv

Author: amauryfa

etg/_adv.py

@@ -33,14 +33,14 @@
              #'calctrl',
              #'hyperlink',
              #'tipdlg',
-             #'taskbar',
+             'taskbar',
              #'sound',
              #'joystick',
              #'animate',
              #'bannerwindow',
              #'editlbox',
              #'notifmsg',
-             #'splash',
+             'splash',
              #'sashwin',
              #'laywin',
              #'odcombo',
@@ -57,7 +57,8 @@
 # sources and/or additional dependencies when building this extension module.
 ETGFILES = ['etg/%s.py' % NAME] + tools.getEtgFiles(INCLUDES)
 DEPENDS = tools.getNonEtgFiles(INCLUDES)
-OTHERDEPS = [  ]
+OTHERDEPS = [ 'etg/cffi/_adv.py',
+            ]
 
 
 #---------------------------------------------------------------------------

etg/unfinished/_html.py renamed to etg/_html.py

@@ -25,22 +25,22 @@
 # included as part of this module. These should all be items that are put in
 # the wxWidgets "html" library in a multi-lib build.
 INCLUDES = [  
-             'htmldefs',
-             'htmlcell',
-             'htmlfilt',
-             'htmltag',
-             'htmlpars',
-             'htmlwin',
-             'htmlprint',
-             'htmlwinpars',
+             #'htmldefs',
+             #'htmlcell',
+             #'htmlfilt',
+             #'htmltag',
+             #'htmlpars',
+             #'htmlwin',
+             #'htmlprint',
+             #'htmlwinpars',
 
-             'helpdata',
-             'helpfrm',
-             'helpdlg',
-             'helpwnd',
-             'helpctrl',
+             #'helpdata',
+             #'helpfrm',
+             #'helpdlg',
+             #'helpwnd',
+             #'helpctrl',
 
-             'htmllbox',
+             #'htmllbox',
              ]
 
 
@@ -64,7 +64,8 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    # XXX(amauryfa): only for SIP?
+    # module.addHeaderCode('#include <wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
     module.addInclude(INCLUDES)

etg/cffi/_adv.py

@@ -0,0 +1,6 @@
+def run(module):
+
+    module.addPyCode('''\
+    from ._adv import *
+    from . import _adv
+    ''', order=0)