diff --git a/wxPython/distrib/wx_create.py b/wxPython/distrib/wx_create.py
index c2827c1eb0..907f2ddd86 100644
--- a/wxPython/distrib/wx_create.py
+++ b/wxPython/distrib/wx_create.py
@@ -28,6 +28,11 @@ del %(suffix)s
 del _rename
 """
 
+call_main = """
+if __name__ == '__main__':
+    main()
+"""    
+
 wxPython_dir = "../wxPython"
 
 subpackage_list = ['.',
@@ -47,6 +52,9 @@ skip_modules = [ '__init__', '__version__',
                  ]
 
 
+add_call_main = ['py/PyAlaCarte.py',  'py/PyAlaMode.py',  'py/PyCrust.py',
+                 'py/PyFilling.py',  'py/PyShell.py',  'py/PyWrap.py'
+                 ]
 
 
 
@@ -101,6 +109,8 @@ for subdir in subpackage_list:
         content = wxmodule_template % globals()
         f = open(fname, 'w')
         f.write(content)
+        if fname in add_call_main:
+            f.write(call_main)            
         f.close()
         print fname + ' created'
 
diff --git a/wxPython/wx/py/PyAlaCarte.py b/wxPython/wx/py/PyAlaCarte.py
index 1863c0c554..f7ecb0740e 100644
--- a/wxPython/wx/py/PyAlaCarte.py
+++ b/wxPython/wx/py/PyAlaCarte.py
@@ -6,3 +6,6 @@ from wxPython.py import PyAlaCarte
 _rename(globals(), PyAlaCarte.__dict__, modulename='py.PyAlaCarte')
 del PyAlaCarte
 del _rename
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/wx/py/PyAlaMode.py b/wxPython/wx/py/PyAlaMode.py
index add9bcdc82..cd5e28c2aa 100644
--- a/wxPython/wx/py/PyAlaMode.py
+++ b/wxPython/wx/py/PyAlaMode.py
@@ -6,3 +6,6 @@ from wxPython.py import PyAlaMode
 _rename(globals(), PyAlaMode.__dict__, modulename='py.PyAlaMode')
 del PyAlaMode
 del _rename
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/wx/py/PyCrust.py b/wxPython/wx/py/PyCrust.py
index 3ad779c05d..128639a9bd 100644
--- a/wxPython/wx/py/PyCrust.py
+++ b/wxPython/wx/py/PyCrust.py
@@ -6,3 +6,6 @@ from wxPython.py import PyCrust
 _rename(globals(), PyCrust.__dict__, modulename='py.PyCrust')
 del PyCrust
 del _rename
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/wx/py/PyFilling.py b/wxPython/wx/py/PyFilling.py
index 9df0ccdb05..283d1ccdad 100644
--- a/wxPython/wx/py/PyFilling.py
+++ b/wxPython/wx/py/PyFilling.py
@@ -6,3 +6,6 @@ from wxPython.py import PyFilling
 _rename(globals(), PyFilling.__dict__, modulename='py.PyFilling')
 del PyFilling
 del _rename
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py
index 9031e9a8c8..4babed4cc3 100644
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -6,3 +6,6 @@ from wxPython.py import PyShell
 _rename(globals(), PyShell.__dict__, modulename='py.PyShell')
 del PyShell
 del _rename
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/wx/py/PyWrap.py b/wxPython/wx/py/PyWrap.py
index c3ec7c2947..33d57f7b17 100644
--- a/wxPython/wx/py/PyWrap.py
+++ b/wxPython/wx/py/PyWrap.py
@@ -6,3 +6,6 @@ from wxPython.py import PyWrap
 _rename(globals(), PyWrap.__dict__, modulename='py.PyWrap')
 del PyWrap
 del _rename
+
+if __name__ == '__main__':
+    main()