Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

wxPython/wxSWIG/swig_lib/python/.cvsignore

@@ -0,0 +1 @@
+Makefile

wxPython/wxSWIG/swig_lib/python/pyexp.swg

@@ -1,3 +1,5 @@
+#include "Python.h"
+
 #include <string.h>
 #include <stdlib.h>
 /* Definitions for Windows/Unix exporting */
@@ -15,12 +17,9 @@
 #   define SWIGEXPORT(a) a
 #endif
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);

wxPython/wxSWIG/swig_lib/python/python.swg

@@ -5,11 +5,11 @@
  * Contains variable linking and pointer type-checking code.
  ************************************************************************/
 
+#include "Python.h"
+
 #include <string.h>
 #include <stdlib.h>
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif