X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0190c47234148dbbb778fb3150d7a375389dbb8b..c5d11c71d791122ec50379c15887898a4d49f1af:/wxPython/src/_core_api.i

diff --git a/wxPython/src/_core_api.i b/wxPython/src/_core_api.i
index c3cc8fd053..940ec32ba3 100644
--- a/wxPython/src/_core_api.i
+++ b/wxPython/src/_core_api.i
@@ -42,7 +42,7 @@ swig_type_info* wxPyFindSwigType(const wxChar* className) {
     if (! swigType) {
         // it wasn't in the cache, so look it up from SWIG
         name.Append(wxT(" *"));
-        swigType = SWIG_Python_TypeQuery(name.mb_str());
+        swigType = SWIG_TypeQuery(name.mb_str());
         
         // if it still wasn't found, try looking for a mapped name
         if (!swigType) {
@@ -53,7 +53,7 @@ swig_type_info* wxPyFindSwigType(const wxChar* className) {
                                (char*)(const char*)name.mbc_str())) != NULL) {
                 name = wxString(PyString_AsString(item), *wxConvCurrent);
                 name.Append(wxT(" *"));
-                swigType = SWIG_Python_TypeQuery(name.mb_str());
+                swigType = SWIG_TypeQuery(name.mb_str());
             }
         }
         if (swigType) {
@@ -94,7 +94,7 @@ bool wxPyConvertSwigPtr(PyObject* obj, void **ptr,
                         const wxChar* className) {
 
     swig_type_info* swigType = wxPyFindSwigType(className);
-    wxCHECK_MSG(swigType != NULL, False, wxT("Unknown type in wxPyConvertSwigPtr"));
+    wxCHECK_MSG(swigType != NULL, false, wxT("Unknown type in wxPyConvertSwigPtr"));
 
     return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1;
 }
@@ -109,16 +109,13 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
     wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyConvertSwigPtr"));
 
 #ifdef SWIG_COBJECT_TYPES
-    robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) swigType->name, NULL);
+    robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name);
 #else
     {
         char result[1024];
-        char *r = result;
-        *(r++) = '_';
-        r = SWIG_Python_PackData(r, &ptr, sizeof(void *));
-        strcpy(r, swigType->name);
-        robj = PyString_FromString(result);
-    }     
+        robj = SWIG_PackVoidPtr(result, ptr, swigType->name, sizeof(result)) ?
+            PyString_FromString(result) : 0;
+    }
 #endif
 
     return robj;
@@ -132,25 +129,6 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
 // even if they are located in another shared library.
 static wxPyCoreAPI API = {
 
-    (p_SWIG_Python_TypeRegister_t)SWIG_Python_TypeRegister,
-    (p_SWIG_Python_TypeCheck_t)SWIG_Python_TypeCheck,
-    (p_SWIG_Python_TypeCast_t)SWIG_Python_TypeCast,
-    (p_SWIG_Python_TypeDynamicCast_t)SWIG_Python_TypeDynamicCast,
-    (p_SWIG_Python_TypeName_t)SWIG_Python_TypeName,
-    (p_SWIG_Python_TypePrettyName_t)SWIG_Python_TypePrettyName,
-    (p_SWIG_Python_TypeQuery_t)SWIG_Python_TypeQuery,
-    (p_SWIG_Python_TypeClientData_t)SWIG_Python_TypeClientData,
-    (p_SWIG_Python_newvarlink_t)SWIG_Python_newvarlink,
-    (p_SWIG_Python_addvarlink_t)SWIG_Python_addvarlink,
-    (p_SWIG_Python_ConvertPtr_t)SWIG_Python_ConvertPtr,
-    (p_SWIG_Python_ConvertPacked_t)SWIG_Python_ConvertPacked,
-    (p_SWIG_Python_PackData_t)SWIG_Python_PackData,
-    (p_SWIG_Python_UnpackData_t)SWIG_Python_UnpackData,
-    (p_SWIG_Python_NewPointerObj_t)SWIG_Python_NewPointerObj,
-    (p_SWIG_Python_NewPackedObj_t)SWIG_Python_NewPackedObj,
-    (p_SWIG_Python_InstallConstants_t)SWIG_Python_InstallConstants,
-    (p_SWIG_Python_MustGetPtr_t)SWIG_Python_MustGetPtr,
-
     wxPyCheckSwigType,
     wxPyConstructObject,
     wxPyConvertSwigPtr,
@@ -205,7 +183,8 @@ static wxPyCoreAPI API = {
     wxPyOORClientData_dtor,
                                              
     wxPyCBInputStream_create,
-
+    wxPyCBInputStream_copy,
+    
     wxPyInstance_Check,
     wxPySwigInstance_Check,