This commit was manufactured by cvs2svn to create tag

'WX_2_4_FIRST_MERGE'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_FIRST_MERGE@18039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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.3pre8"
+VERSION          = "2.3.4p1"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -87,7 +87,7 @@ HYBRID = 1         # 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.)
 
-WXDLLVER = '233'   # Version part of wxWindows DLL name
+WXDLLVER = '234'   # Version part of wxWindows DLL name
 
 
 #----------------------------------------------------------------------
@@ -176,6 +176,13 @@ if CORE_ONLY:
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0
 
+if debug:
+    FINAL  = 0
+    HYBRID = 0
+
+if FINAL:
+    HYBRID = 0
+
 
 if UNICODE and os.name != 'nt':
     print "UNICODE is currently only supported on Win32"
@@ -203,13 +210,6 @@ if os.name == 'nt':
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
 
-    if debug:
-        FINAL  = 0
-        HYBRID = 0
-
-    if HYBRID:
-        FINAL = 0
-
     includes = ['src',
                 opj(WXDIR, 'lib', 'mswdll' + libFlag()),
                 opj(WXDIR, 'include'),
@@ -305,7 +305,7 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
                ('WXP_USE_THREAD', '1'),
                ]
     libdirs = []
-    libs = []
+    libs = ['stdc++']
 
     cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
     cflags = string.split(cflags)
@@ -319,14 +319,15 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
     lflags = string.split(lflags)
 
     NO_SCRIPTS = 1
+    BUILD_DLLWIDGET = 0
 
 
 elif os.name == 'posix':
-    # Set flags for Unix type platforms
+    # Set flags for other Unix type platforms
 
     WXDIR = '..'              # assumes IN_CVS_TREE
     WXPLAT = '__WXGTK__'      # and assumes GTK...
-    GENDIR = 'gtk'            # Need to allow for Motif eventually too
+    GENDIR = 'gtk'            # Need to allow for X11 and/or Motif eventually too
 
     includes = ['src']
     defines = [('SWIG_GLOBAL', None),
@@ -348,6 +349,12 @@ elif os.name == 'posix':
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 
+    # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
+    # wx-config doesn't output that for some reason.  For now, just
+    # add it unconditionally but we should really check if the lib is
+    # really found there or wx-config should be fixed.
+    libdirs.append("/usr/X11R6/lib")
+
 
 else:
     raise 'Sorry Charlie...'
@@ -357,7 +364,9 @@ else:
 # Check if the version file needs updated
 #----------------------------------------------------------------------
 
-#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
+# Always do it since the version string can change based on the UNICODE flag
+
+##if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
 open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
 
 
@@ -786,6 +795,7 @@ if not GL_ONLY and BUILD_XRC:
                                 '%s/xh_radbt.cpp' % XMLLOC,
                                 '%s/xh_radbx.cpp' % XMLLOC,
                                 '%s/xh_scrol.cpp' % XMLLOC,
+                                '%s/xh_scwin.cpp' % XMLLOC,
 
                                 '%s/xh_sizer.cpp' % XMLLOC,
                                 '%s/xh_slidr.cpp' % XMLLOC,