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

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 0188ea6fd086e04e3f1f0f09ff22e2d8a7ab9c3e..35032e2fcde24d40df7aacb89ea88dd75c86a0a7 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -363,11 +363,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(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 = '_'
     sources = []
 
     if add_under:  pre = '_'


@@ -378,7 +373,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')
         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+'_']
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']


@@ -422,7 +416,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
 
                 # Then run swig for real
                 cmd = [ swig_cmd ] + swig_args + interface + \
 
                 # 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)
 
                 msg(' '.join(cmd))
                 spawn(cmd)
 


@@ -1051,7 +1045,6 @@ class BuildRenamers:
         # do a depth first iteration over what's left
         for node in topnode:
             doRename = False
         # do a depth first iteration over what's left
         for node in topnode:
             doRename = False

-            doPtr = False

             addWX = False
             revOnly = False
     
             addWX = False
             revOnly = False
     


@@ -1060,7 +1053,6 @@ class BuildRenamers:
                 lastClassName = name = self.GetAttr(node, "name")
                 lastClassSymName = sym_name = self.GetAttr(node, "sym_name")
                 doRename = True
                 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
                 if sym_name != name:
                     name = sym_name
                     addWX = True


@@ -1118,8 +1110,6 @@ class BuildRenamers:
                 if addWX and not old.startswith('wx'):
                     old = 'wx'+old
                 pyFile.write("%s = wx.%s.%s\n" % (old, modname, new))
                 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))

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