Minimal changes needed to build/run wxPython on the 2.5 branch after

the merge.  Still need to look for and apply most changes and new
additions that have happened since the last merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/setup.py

@@ -748,7 +748,7 @@ if BUILD_OGL:
                              '%s/composit.cpp' % OGLLOC,
                              '%s/divided.cpp' % OGLLOC,
                              '%s/lines.cpp' % OGLLOC,
-                             '%s/misc.cpp' % OGLLOC,
+                             '%s/oglmisc.cpp' % OGLLOC,
                              '%s/basic2.cpp' % OGLLOC,
                              '%s/canvas.cpp' % OGLLOC,
                              '%s/constrnt.cpp' % OGLLOC,
@@ -758,7 +758,7 @@ if BUILD_OGL:
                              ] + swig_sources,
 
                     include_dirs =  [OGLINC] + includes,
-                    define_macros = defines,
+                    define_macros = defines + [('wxUSE_DEPRECATED', '0')],
 
                     library_dirs = libdirs,
                     libraries = libs,