fixed compile error

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index f981ddbfe15907d4deba428e67ee3db191d9e68a..1139ac09e0b68f3f0cd2ecef10a56da8432b9a28 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,9 +37,9 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
-VER_RELEASE      = 1
-VER_SUBREL       = 6      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
+VER_RELEASE      = 2
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -101,6 +101,11 @@ SWIG = "swig"      # The swig executable to use.
 
 BUILD_RENAMERS = 1 # 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
+                   # 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
                    # will ensure that the right headers are found and the
                    # right libs are linked.
@@ -211,6 +216,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
+             'FULL_DOCS', 
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(flag) == 0:
@@ -294,7 +300,7 @@ 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+'_swig.xml')
+        xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml')
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
@@ -741,6 +747,10 @@ swig_args = ['-c++',
 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')
 
+if FULL_DOCS:
+    swig_args.append('-D_DO_FULL_DOCS')
+    
+
 swig_deps = [ 'src/my_typemaps.i',
               'src/common.swg',
               'src/pyrun.swg',