X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68bc8549d81adc1b6f031bdbb03b91a71944197c..c31c771b2d9fff41ff774bbc4515c36f3692dbe0:/wxPython/src/wx.i diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index f51a623b6d..3925c11c67 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -12,6 +12,7 @@ %module wx + %{ #include "helpers.h" %} @@ -107,12 +108,12 @@ public: %inline %{ wxPyApp* wxGetApp() { - return wxPythonApp; + //return wxPythonApp; + return (wxPyApp*)wxTheApp; } %} - //---------------------------------------------------------------------- // this is used to cleanup after wxWindows when Python shuts down. @@ -157,12 +158,12 @@ extern "C" SWIGEXPORT(void) initfontsc(); // the wxc module and will then have safe access to these functions, even if // in another shared library. static wxPyCoreAPI API = { - SWIG_MakePtr, - SWIG_GetPtr, - SWIG_GetPtrObj, - SWIG_RegisterMapping, - SWIG_addvarlink, - SWIG_newvarlink, + (p_SWIG_MakePtr_t)SWIG_MakePtr, + (p_SWIG_GetPtr_t)SWIG_GetPtr, + (p_SWIG_GetPtrObj_t)SWIG_GetPtrObj, + (p_SWIG_RegisterMapping_t)SWIG_RegisterMapping, + (p_SWIG_addvarlink_t)SWIG_addvarlink, + (p_SWIG_newvarlink_t)SWIG_newvarlink, wxPyBeginAllowThreads, wxPyEndAllowThreads, @@ -202,7 +203,13 @@ static wxPyCoreAPI API = { wxPyMake_wxSizer, wxPyPtrTypeMap_Add, wxArrayString2PyList_helper, - wxArrayInt2PyList_helper + wxArrayInt2PyList_helper, + + wxPyClientData_dtor, + wxPyUserData_dtor, + wxPyOORClientData_dtor, + + wxPyCBInputStream_create }; @@ -267,4 +274,3 @@ static wxPyCoreAPI API = { %pragma(python) include="_extras.py"; -