wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index ca538a222798c00062c724e66ca937bd76fb924e..e87325e8fe9f53077a649e61eb589adc3d40516b 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -40,7 +40,7 @@ VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 6
 VER_RELEASE      = 0
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
 VER_MINOR        = 6
 VER_RELEASE      = 0
 VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets

-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS        = "pre"     # release flags, such as prerelease or RC num, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -241,8 +241,9 @@ WXPYTHON_TYPE_TABLE = '_wxPython_table'
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
 #----------------------------------------------------------------------
 
 # Boolean (int) flags

-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 'BUILD_IEWIN',
+              'BUILD_OGL', 'BUILD_STC',     

              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',


@@ -668,7 +669,7 @@ if os.name == 'nt':
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'

-           
+

     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),
     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),


@@ -842,7 +843,7 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 # dirs as includes so we don't have to guess which is correct.
  
 wxfilesdir = ""
 # dirs as includes so we don't have to guess which is correct.
  
 wxfilesdir = ""

-i_subdir = opj("include", "wx", "wxPython", "i_files")
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")

 if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
 if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:


@@ -886,7 +887,7 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 # BuildRenamers
 ####################################
 
 # BuildRenamers
 ####################################
 

-import pprint
+import pprint, shutil

 try:
     import libxml2
     FOUND_LIBXML2 = True
 try:
     import libxml2
     FOUND_LIBXML2 = True


@@ -972,11 +973,14 @@ class BuildRenamers:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (pyDest, pyDestTemp)]:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (pyDest, pyDestTemp)]:

+            # NOTE: we don't use shutil.move() because it was introduced
+            # in Python 2.3. Eventually we can switch to it when people
+            # stop building using 2.2.

             if not os.path.exists(dest):
             if not os.path.exists(dest):

-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)

             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)
             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)

-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)

             else:
                 print dest + " not changed."
                 os.unlink(temp)
             else:
                 print dest + " not changed."
                 os.unlink(temp)