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/src/misc.i

@@ -14,7 +14,6 @@
 
 %{
 #include "helpers.h"
-#include <wx/resource.h>
 #include <wx/tooltip.h>
 #include <wx/busyinfo.h>
 #include <wx/geometry.h>
@@ -666,6 +665,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
 #if 0  // we want to use the definition from the header, not the
        // one SWIG will generate.
 %}
+// See also wxPy_ReinitStockObjects in helpers.cpp
 extern wxAcceleratorTable wxNullAcceleratorTable;
 %{
 #endif