dismiss the popup when an unprocessed key is pressed

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index f0148d1dddf0d3f6f085dcd98aae73005d6fe826..aa2c33fd9f373cdae0ae78db447f3024f8e26b03 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 

-import sys, os, string
+import sys, os, string, glob

 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath
 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath


@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.2"
+VERSION          = "2.3.3"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"


@@ -28,7 +28,7 @@ on.
 """
 
 
 """
 
 

-BUILD_GLCANVAS = 0 #1 # If true, build the contrib/glcanvas extension module
+BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module

 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system


@@ -40,7 +40,7 @@ BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 CORE_ONLY = 0      # if true, don't build any of the above
 
 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 

-GL_ONLY = 0 #1 #0        # Only used when making the -gl RPM.  See the "b" script
+GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script

                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the


@@ -68,7 +68,7 @@ HYBRID = 0         # If set and not debug or FINAL, then build a
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 

-WXDLLVER = '232'   # Version part of DLL name
+WXDLLVER = '233'   # Version part of DLL name

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -137,7 +137,7 @@ sys.argv = filter(None, sys.argv)
 
 
 if CORE_ONLY:
 
 
 if CORE_ONLY:

-    BUILD_GLCANVAS = 0 #0
+    BUILD_GLCANVAS = 0

     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0


@@ -832,6 +832,19 @@ if not GL_ONLY and BUILD_DLLWIDGET:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

+#----------------------------------------------------------------------
+# Tools and scripts
+#----------------------------------------------------------------------
+
+TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
+         ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
+                                   glob.glob("tools/XRCed/*.xrc") +
+                                   ["tools/XRCed/CHANGES",
+                                    "tools/XRCed/TODO",
+                                    "tools/XRCed/README"]),
+         ]
+
+

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -858,6 +871,8 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,

+
+              ##data_files = TOOLS,

               )
 
     else:
               )
 
     else:


@@ -874,6 +889,7 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,

+

               )
 
 
               )