Allow art provider IDs for the extra bitmaps in a wxBitmapButton. (The

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index d672a441966889431c0c7a3c056cc5548b30fd44..dfc10d00eadf53d3cf148624b544a0e08829f677 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -82,24 +82,16 @@ CLEANUP.append('wx/__version__.py')
 
 if USE_SWIG:
     try:
 
 if USE_SWIG:
     try:

-        # It may come on either stdout or stderr, depending on the
-        # version, so read both.
-        i, o, e = os.popen3(SWIG + ' -version', 't')
-        stext = o.read() + e.read()
-        import re
-        match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
-        if not match:
-            raise 'NotFound'
-        SVER = match.group(0)
+        SVER = swig_version()

         open('include/wx/wxPython/swigver.h', 'w').write('''\
 // This file was generated by setup.py
 
 #define wxPy_SWIG_VERSION "SWIG-%s"
 ''' % SVER)
         msg('Using SWIG-' + SVER)
         open('include/wx/wxPython/swigver.h', 'w').write('''\
 // This file was generated by setup.py
 
 #define wxPy_SWIG_VERSION "SWIG-%s"
 ''' % SVER)
         msg('Using SWIG-' + SVER)

-

     except:
         msg('\nUnable to get SWIG version number\n')
     except:
         msg('\nUnable to get SWIG version number\n')

+        

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -480,8 +472,9 @@ if BUILD_GLCANVAS:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]

-        gl_lflags = gl_config.split() + lflags
+        gl_lflags = gl_config.split()

         gl_libs = libs
         gl_libs = libs

+        

     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags


@@ -784,6 +777,8 @@ if __name__ == "__main__":
 
               packages = ['wxPython',
                           'wxPython.lib',
 
               packages = ['wxPython',
                           'wxPython.lib',

+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',

                           'wxPython.lib.colourchooser',
                           'wxPython.lib.editor',
                           'wxPython.lib.mixins',
                           'wxPython.lib.colourchooser',
                           'wxPython.lib.editor',
                           'wxPython.lib.mixins',