don't crash in dtor if the X11 window hadn't been created (patch 1640153)

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 5a00a2179f891da54ef418fe917631b1db9956dc..334dda3009226905d16dc79b9f8663737bedae9b 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,9 +38,9 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 8
-VER_RELEASE      = 0
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = ""  # release flags, such as prerelease or RC num, etc.
+VER_RELEASE      = 1
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = ""     # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -105,7 +105,7 @@ FULL_DOCS = 0      # Some docstrings are split into a basic docstring and a
                    # cause the two strings to be combined and output
                    # as the full docstring.
 
-UNICODE = 0        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
+UNICODE = 1        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
                    # will ensure that the right headers are found and the
                    # right libs are linked.
 
@@ -552,6 +552,19 @@ def makeLibName(name):
     return [libname]
 
 
+def findLib(name, libdirs):
+    name = makeLibName(name)[0]
+    if os.name == 'posix':
+        dirs = libdirs + ['/usr/lib', '/usr/local/lib']
+        name = 'lib'+name
+    else:
+        dirs = libdirs[:]
+    for d in dirs:
+        p = os.path.join(d, name)
+        if glob.glob(p+'*') != []:
+            return True
+    return False
+
 
 def adjustCFLAGS(cflags, defines, includes):
     '''Extract the raw -I, -D, and -U flags and put them into
@@ -599,11 +612,13 @@ def getExtraPath(shortVer=True, addOpts=False):
     if shortVer:
         # short version, just Major.Minor
         ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
-        
+         
         # plus release if minor is odd
         if VER_MINOR % 2 == 1:
             ep += ".%d" % VER_RELEASE
             
+        ##ep = "wx-%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE)
+        
     else:
         # long version, full version 
         ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL)
@@ -856,11 +871,9 @@ except:
 
 if UNICODE:
     BUILD_BASE = BUILD_BASE + '.unicode'
-    ##VER_FLAGS += 'u'
 
 if os.path.exists('DAILY_BUILD'):
-    
-    VER_FLAGS += '-' + open('DAILY_BUILD').read().strip()
+    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)