test for special keys first, before testing for alphanumeric ones as even keys such...

[wxWidgets.git] / wxPython / src / __init__.py

diff --git a/wxPython/src/__init__.py b/wxPython/src/__init__.py
index d6c0977443576a95ca246dbfb458c06bef6b5f09..1bd0cd4752e7618ebe6b6153939d404f45f8f7af 100644 (file)
--- a/wxPython/src/__init__.py
+++ b/wxPython/src/__init__.py
@@ -23,32 +23,37 @@ __all__ = [
     'tools',
 
     # other modules
+    'animate',
+    'aui',
     'calendar',
+    'combo',
     'grid',
     'html',
+    'media',
+    'richtext',
+    'webkit',
     'wizard',
+    'xrc',
 
     # contribs (need a better way to find these...)
-    'activex',
     'gizmos',
     'glcanvas',
-    'iewin',
-    'ogl',
     'stc',
-    'xrc',
     ]
 
 # Load the package namespace with the core classes and such
 from wx._core import *
 del wx
 
+if 'wxMSW' in PlatformInfo:
+    __all__ += ['activex']
+
 # Load up __all__ with all the names of items that should appear to be
 # defined in this pacakge so epydoc will document them that way.
 import wx._core
 __docfilter__ = wx._core.__DocFilter(globals())
 
-__all__ += [name for name in dir(wx._core)
-            if not (name.startswith('__') and name.endswith('__'))]
+__all__ += [name for name in dir(wx._core) if not name.startswith('_')]