add SetSelection(-1) test (part of patch 1506943)

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 09e89eaf53d6c99fd5f0231674e35d6a012f64c9..46250189878756a3f0e62becafc888ab606a2a99 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -99,7 +99,7 @@ USE_SWIG = 0       # Should we actually execute SWIG, or just use the
 
 SWIG = "swig"      # The swig executable to use.
 
-BUILD_RENAMERS = 1 # Should we build the renamer modules too?
+BUILD_RENAMERS = 0 # Should we build the renamer modules too?
 
 FULL_DOCS = 0      # Some docstrings are split into a basic docstring and a
                    # details string.  Setting this flag to 1 will
@@ -178,7 +178,7 @@ CONTRIBS_INC = ""  # A dir to add as an -I flag when compiling the contribs
 
 # Some MSW build settings
 
-MONOLITHIC = 1     # The core wxWidgets lib can be built as either a
+MONOLITHIC = 0     # The core wxWidgets lib can be built as either a
                    # single monolithic DLL or as a collection of DLLs.
                    # This flag controls which set of libs will be used
                    # on Windows.  (For other platforms it is automatic
@@ -271,7 +271,8 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
 
 # String options
 for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
-               'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR', 
+               'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
+               'VER_FLAGS',
                ]:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
@@ -283,41 +284,6 @@ for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
 sys.argv = filter(None, sys.argv)
 
 
-#----------------------------------------------------------------------
-# build options file
-#----------------------------------------------------------------------
-
-if SYS_WX_CONFIG is None:
-    SYS_WX_CONFIG = WX_CONFIG
-
-build_options_template = """
-UNICODE=%d
-UNDEF_NDEBUG=%d
-INSTALL_MULTIVERSION=%d
-FLAVOUR="%s"
-EP_ADD_OPTS=%d
-EP_FULL_VER=%d
-WX_CONFIG="%s"
-WXPORT="%s"
-MONOLITHIC=%d
-FINAL=%d
-HYBRID=%d
-""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
-       EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
-
-try: 
-    from build_options import *
-except:
-    build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
-    if not os.path.exists(build_options_file):
-        try:
-            myfile = open(build_options_file, "w")
-            myfile.write(build_options_template)
-            myfile.close()
-        except:
-            print "WARNING: Unable to create build_options.py."
-    
-
 #----------------------------------------------------------------------
 # some helper functions
 #----------------------------------------------------------------------
@@ -363,11 +329,6 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
     if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
         os.mkdir(os.path.join(dir, gendir))
 
-    if USE_SWIG and not os.path.exists(os.path.join("docs", "xml-raw")):
-        if not os.path.exists("docs"):
-            os.mkdir("docs")
-        os.mkdir(os.path.join("docs", "xml-raw"))
-
     sources = []
 
     if add_under:  pre = '_'
@@ -378,7 +339,6 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         i_file   = os.path.join(dir, file)
         py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
         cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
-        xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml')
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
@@ -422,7 +382,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
 
                 # Then run swig for real
                 cmd = [ swig_cmd ] + swig_args + interface + \
-                      ['-I'+dir, '-o', cpp_file, '-xmlout', xml_file, i_file]
+                      ['-I'+dir, '-o', cpp_file, i_file]
                 msg(' '.join(cmd))
                 spawn(cmd)
 
@@ -798,6 +758,7 @@ elif os.name == 'posix':
         cflags.append('-O3')
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+    MONOLITHIC = (lflags.find("_xrc") == -1)
     lflags = lflags.split()
 
     WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1]
@@ -852,6 +813,41 @@ else:
     raise 'Sorry, platform not supported...'
 
 
+#----------------------------------------------------------------------
+# build options file
+#----------------------------------------------------------------------
+
+if SYS_WX_CONFIG is None:
+    SYS_WX_CONFIG = WX_CONFIG
+
+build_options_template = """
+UNICODE=%d
+UNDEF_NDEBUG=%d
+INSTALL_MULTIVERSION=%d
+FLAVOUR="%s"
+EP_ADD_OPTS=%d
+EP_FULL_VER=%d
+WX_CONFIG="%s"
+WXPORT="%s"
+MONOLITHIC=%d
+FINAL=%d
+HYBRID=%d
+""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
+       EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
+
+try: 
+    from build_options import *
+except:
+    build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
+    if not os.path.exists(build_options_file):
+        try:
+            myfile = open(build_options_file, "w")
+            myfile.write(build_options_template)
+            myfile.close()
+        except:
+            print "WARNING: Unable to create build_options.py."
+    
+
 #----------------------------------------------------------------------
 # post platform setup checks and tweaks, create the full version string
 #----------------------------------------------------------------------
@@ -903,6 +899,7 @@ if USE_SWIG:
                        '-fvirtual',
                        '-fastinit',
                        '-fastunpack',
+                       #'-outputtuple',  Currently setting this with a -D define above
                        ]
              
 if UNICODE:
@@ -1050,7 +1047,6 @@ class BuildRenamers:
         # do a depth first iteration over what's left
         for node in topnode:
             doRename = False
-            doPtr = False
             addWX = False
             revOnly = False
     
@@ -1059,7 +1055,6 @@ class BuildRenamers:
                 lastClassName = name = self.GetAttr(node, "name")
                 lastClassSymName = sym_name = self.GetAttr(node, "sym_name")
                 doRename = True
-                doPtr = True
                 if sym_name != name:
                     name = sym_name
                     addWX = True
@@ -1117,8 +1112,6 @@ class BuildRenamers:
                 if addWX and not old.startswith('wx'):
                     old = 'wx'+old
                 pyFile.write("%s = wx.%s.%s\n" % (old, modname, new))
-                if doPtr:
-                    pyFile.write("%sPtr = wx.%s.%sPtr\n" % (old, modname, new))
                 
     
     #---------------------------------------------------------------------------