Compile fix

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index f522db9e2080171ab424ced38d9e8468edfdecca..2c5075fd458cd45d82404e74c4e04ef578af40c0 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,7 +38,7 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 2
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 2

-VER_SUBREL       = 3      # wxPython release num for x.y.z release of wxWidgets
+VER_SUBREL       = 9      # wxPython release num for x.y.z release of wxWidgets

 VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"


@@ -80,7 +80,6 @@ Topic :: Software Development :: User Interfaces
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 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 = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.


@@ -129,7 +128,7 @@ WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 

-WXPORT = 'gtk'     # On Linux/Unix there are several ports of wxWidgets available.
+WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets available.

                    # Setting this value lets you select which will be used for
                    # the wxPython build.  Possibilites are 'gtk', 'gtk2' and
                    # 'x11'.  Curently only gtk and gtk2 works.
                    # Setting this value lets you select which will be used for
                    # the wxPython build.  Possibilites are 'gtk', 'gtk2' and
                    # 'x11'.  Curently only gtk and gtk2 works.


@@ -215,7 +214,7 @@ if os.name == 'nt':
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
 #----------------------------------------------------------------------
 
 # Boolean (int) flags

-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
+for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 

              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',


@@ -253,6 +252,7 @@ def Verify_WX_CONFIG():
     # if WX_CONFIG hasn't been set to an explicit value then construct one.
     global WX_CONFIG
     if WX_CONFIG is None:
     # if WX_CONFIG hasn't been set to an explicit value then construct one.
     global WX_CONFIG
     if WX_CONFIG is None:

+        WX_CONFIG='wx-config'

         port = WXPORT
         if port == "x11":
             port = "x11univ"
         port = WXPORT
         if port == "x11":
             port = "x11univ"


@@ -402,11 +402,11 @@ class wx_install_headers(distutils.command.install_headers.install_headers):
     Install the header files to the WXPREFIX, with an extra dir per
     filename too
     """
     Install the header files to the WXPREFIX, with an extra dir per
     filename too
     """

-    def initialize_options (self):
+    def initialize_options(self):

         self.root = None
         distutils.command.install_headers.install_headers.initialize_options(self)
 
         self.root = None
         distutils.command.install_headers.install_headers.initialize_options(self)
 

-    def finalize_options (self):
+    def finalize_options(self):

         self.set_undefined_options('install', ('root', 'root'))
         distutils.command.install_headers.install_headers.finalize_options(self)
 
         self.set_undefined_options('install', ('root', 'root'))
         distutils.command.install_headers.install_headers.finalize_options(self)
 


@@ -487,7 +487,7 @@ def makeLibName(name):
 
 
 def adjustCFLAGS(cflags, defines, includes):
 
 
 def adjustCFLAGS(cflags, defines, includes):

-    '''Extrace the raw -I, -D, and -U flags and put them into
+    '''Extract the raw -I, -D, and -U flags and put them into

        defines and includes as needed.'''
     newCFLAGS = []
     for flag in cflags:
        defines and includes as needed.'''
     newCFLAGS = []
     for flag in cflags:


@@ -527,7 +527,6 @@ if CORE_ONLY:
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
     BUILD_STC = 0

-    BUILD_XRC = 0

     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_IEWIN = 0


@@ -753,8 +752,10 @@ if FULL_DOCS:
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),

+              opj(WXPY_SRC, 'src/my_fragments.i'),

               opj(WXPY_SRC, 'src/common.swg'),
               opj(WXPY_SRC, 'src/pyrun.swg'),
               opj(WXPY_SRC, 'src/common.swg'),
               opj(WXPY_SRC, 'src/pyrun.swg'),

+              opj(WXPY_SRC, 'src/python.swg'),

               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',