reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -45,7 +45,8 @@ private:
 | 
			
		||||
#define SWIG_TypeName        SWIG_Python_TypeName
 | 
			
		||||
#define SWIG_TypeQuery       SWIG_Python_TypeQuery
 | 
			
		||||
#define SWIG_TypeClientData  SWIG_Python_TypeClientData
 | 
			
		||||
 | 
			
		||||
#define SWIG_PackData        SWIG_Python_PackData
 | 
			
		||||
#define SWIG_UnpackData      SWIG_Python_UnpackData
 | 
			
		||||
 | 
			
		||||
/***********************************************************************
 | 
			
		||||
 * common.swg for wxPython
 | 
			
		||||
@@ -59,36 +60,35 @@ private:
 | 
			
		||||
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#if defined(_WIN32) || defined(__WIN32__)
 | 
			
		||||
#       if defined(_MSC_VER)
 | 
			
		||||
#               if defined(STATIC_LINKED)
 | 
			
		||||
#                       define SWIGEXPORT(a) a
 | 
			
		||||
#                       define SWIGIMPORT(a) extern a
 | 
			
		||||
#               else
 | 
			
		||||
#                       define SWIGEXPORT(a) __declspec(dllexport) a
 | 
			
		||||
#                       define SWIGIMPORT(a) extern a
 | 
			
		||||
#               endif
 | 
			
		||||
#       else
 | 
			
		||||
#               if defined(__BORLANDC__)
 | 
			
		||||
#                       define SWIGEXPORT(a) a _export
 | 
			
		||||
#                       define SWIGIMPORT(a) a _export
 | 
			
		||||
#               else
 | 
			
		||||
#                       define SWIGEXPORT(a) a
 | 
			
		||||
#                       define SWIGIMPORT(a) a
 | 
			
		||||
#               endif
 | 
			
		||||
#       endif
 | 
			
		||||
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 | 
			
		||||
#  if defined(_MSC_VER) || defined(__GNUC__)
 | 
			
		||||
#    if defined(STATIC_LINKED)
 | 
			
		||||
#      define SWIGEXPORT(a) a
 | 
			
		||||
#      define SWIGIMPORT(a) extern a
 | 
			
		||||
#    else
 | 
			
		||||
#      define SWIGEXPORT(a) __declspec(dllexport) a
 | 
			
		||||
#      define SWIGIMPORT(a) extern a
 | 
			
		||||
#    endif
 | 
			
		||||
#  else
 | 
			
		||||
#    if defined(__BORLANDC__)
 | 
			
		||||
#      define SWIGEXPORT(a) a _export
 | 
			
		||||
#      define SWIGIMPORT(a) a _export
 | 
			
		||||
#    else
 | 
			
		||||
#      define SWIGEXPORT(a) a
 | 
			
		||||
#      define SWIGIMPORT(a) a
 | 
			
		||||
#    endif
 | 
			
		||||
#  endif
 | 
			
		||||
#else
 | 
			
		||||
#       define SWIGEXPORT(a) a
 | 
			
		||||
#       define SWIGIMPORT(a) a
 | 
			
		||||
#  define SWIGEXPORT(a) a
 | 
			
		||||
#  define SWIGIMPORT(a) a
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef SWIG_GLOBAL
 | 
			
		||||
#define SWIGRUNTIME(a) SWIGEXPORT(a)
 | 
			
		||||
#  define SWIGRUNTIME(a) SWIGEXPORT(a)
 | 
			
		||||
#else
 | 
			
		||||
#define SWIGRUNTIME(a) static a
 | 
			
		||||
#  define SWIGRUNTIME(a) static a
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
extern "C" {
 | 
			
		||||
#endif
 | 
			
		||||
@@ -97,10 +97,10 @@ typedef void *(*swig_converter_func)(void *);
 | 
			
		||||
typedef struct swig_type_info *(*swig_dycast_func)(void **);
 | 
			
		||||
 | 
			
		||||
typedef struct swig_type_info {
 | 
			
		||||
  const char             *name;                 
 | 
			
		||||
  const char             *name;
 | 
			
		||||
  swig_converter_func     converter;
 | 
			
		||||
  const char             *str;
 | 
			
		||||
  void                   *clientdata;	
 | 
			
		||||
  void                   *clientdata;
 | 
			
		||||
  swig_dycast_func        dcast;
 | 
			
		||||
  struct swig_type_info  *next;
 | 
			
		||||
  struct swig_type_info  *prev;
 | 
			
		||||
@@ -114,6 +114,8 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 | 
			
		||||
SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
 | 
			
		||||
SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
 | 
			
		||||
SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 | 
			
		||||
SWIGIMPORT(char *)           SWIG_PackData(char *, void *, int);
 | 
			
		||||
SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
@@ -121,6 +123,7 @@ SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/***********************************************************************
 | 
			
		||||
 * pyrun.swg for wxPython
 | 
			
		||||
 *
 | 
			
		||||
@@ -131,7 +134,6 @@ SWIGIMPORT(void)             SWIG_TypeClientData(swig_type_info *, void *);
 | 
			
		||||
 *
 | 
			
		||||
 ************************************************************************/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#include "Python.h"
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
@@ -162,8 +164,6 @@ typedef struct swig_const_info {
 | 
			
		||||
    swig_type_info **ptype;
 | 
			
		||||
} swig_const_info;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* Common SWIG API */
 | 
			
		||||
#define SWIG_ConvertPtr(obj, pp, type, flags) \
 | 
			
		||||
  SWIG_Python_ConvertPtr(obj, pp, type, flags)
 | 
			
		||||
@@ -179,34 +179,27 @@ typedef struct swig_const_info {
 | 
			
		||||
  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
 | 
			
		||||
#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
 | 
			
		||||
  SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
 | 
			
		||||
#define SWIG_PackData(c, ptr, sz) \
 | 
			
		||||
  SWIG_Python_PackData(c, ptr, sz)
 | 
			
		||||
#define SWIG_UnpackData(c, ptr, sz) \
 | 
			
		||||
  SWIG_Python_UnpackData(c, ptr, sz)
 | 
			
		||||
#define SWIG_NewPackedObj(ptr, sz, type) \
 | 
			
		||||
  SWIG_Python_NewPackedObj(ptr, sz, type)
 | 
			
		||||
#define SWIG_InstallConstants(d, constants) \
 | 
			
		||||
  SWIG_Python_InstallConstants(d, constants)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
SWIGEXPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
 | 
			
		||||
SWIGEXPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
 | 
			
		||||
SWIGEXPORT(void *)	      SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
 | 
			
		||||
SWIGIMPORT(int)               SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int);
 | 
			
		||||
SWIGIMPORT(PyObject *)        SWIG_Python_NewPointerObj(void *, swig_type_info *,int own);
 | 
			
		||||
SWIGIMPORT(void *)            SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int);
 | 
			
		||||
SWIGIMPORT(PyObject *)        SWIG_Python_newvarlink(void);
 | 
			
		||||
SWIGIMPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 | 
			
		||||
SWIGIMPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
 | 
			
		||||
SWIGIMPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
 | 
			
		||||
SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
 | 
			
		||||
 | 
			
		||||
SWIGEXPORT(PyObject *)        SWIG_Python_newvarlink(void);
 | 
			
		||||
SWIGEXPORT(void)              SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 | 
			
		||||
SWIGEXPORT(int)               SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int);
 | 
			
		||||
SWIGEXPORT(char *)            SWIG_Python_PackData(char *c, void *, int);
 | 
			
		||||
SWIGEXPORT(char *)            SWIG_Python_UnpackData(char *c, void *, int);
 | 
			
		||||
SWIGEXPORT(PyObject *)        SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *);
 | 
			
		||||
SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* Contract support */
 | 
			
		||||
 | 
			
		||||
#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user