Some fixes for wxURLDataObject when wxUSE_UNICODE==1

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 28ed092872c1d28feb0aad678c081882a7e1dee0..59f662d0e90f8df4a29ed549dcfe5fcbc3f0b43b 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.3rc"
+VERSION          = "2.3.3pre"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -33,7 +33,8 @@ 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_GIZMOS = 1   # Build a module for the gizmos contrib library
-BUILD_DLLWIDGET = 1# Build a module for the gizmos contrib library
+BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
+                   # to be loaded from a DLL to be used from Python.
 
 BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 
@@ -46,6 +47,9 @@ GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # files already in the distribution?
 
+USE_UNICODE = 0    # This will pass the 'wxUSE_UNICODE' flag to SWIG.
+                   # At the moment only tested for 'CORE_ONLY = 1'
+
 IN_CVS_TREE = 0    # Set to true if building in a full wxWindows CVS
                    # tree, otherwise will assume all needed files are
                    # available in the wxPython source distribution
@@ -83,11 +87,14 @@ def opj(*args):
 
 def libFlag():
     if FINAL:
-        return ''
+        rv = ''
     elif HYBRID:
-        return 'h'
+        rv = 'h'
     else:
-        return 'd'
+        rv = 'd'
+    if USE_UNICODE:
+        rv = 'u' + rv
+    return rv
 
 
 #----------------------------------------------------------------------
@@ -116,7 +123,7 @@ if bcpp_compiling:
 
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
+             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'USE_UNICODE',
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:
@@ -136,6 +143,10 @@ for option in ['WX_CONFIG', 'WXDLLVER', ]:
 sys.argv = filter(None, sys.argv)
 
 
+
+#----------------------------------------------------------------------
+# sanity checks
+
 if CORE_ONLY:
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
@@ -145,6 +156,10 @@ if CORE_ONLY:
     BUILD_DLLWIDGET = 0
 
 
+if USE_UNICODE and os.name != 'nt':
+    print "UNICODE is currently only supported on Win32"
+    sys.exit()
+
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
 #----------------------------------------------------------------------
@@ -312,6 +327,9 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword',
              #'-docstring', '-Sbefore',
              '-I./src', '-D'+WXPLAT,
              ]
+if USE_UNICODE:
+    swig_args.append('-DwxUSE_UNICODE')
+
 swig_deps = ['src/my_typemaps.i']