X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19e30148e18cc99296b26503c155e5cef59045f4..3efe95494d7a262c1bdbfa44aabb5137a6973983:/wxPython/src/wx.i?ds=sidebyside diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index 010621f4fa..3925c11c67 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -109,12 +109,11 @@ public: %inline %{ wxPyApp* wxGetApp() { //return wxPythonApp; - return (wxPyApp*)wxGetApp(); + return (wxPyApp*)wxTheApp; } %} - //---------------------------------------------------------------------- // this is used to cleanup after wxWindows when Python shuts down. @@ -159,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, @@ -208,7 +207,9 @@ static wxPyCoreAPI API = { wxPyClientData_dtor, wxPyUserData_dtor, - wxPyOORClientData_dtor + wxPyOORClientData_dtor, + + wxPyCBInputStream_create }; @@ -273,4 +274,3 @@ static wxPyCoreAPI API = { %pragma(python) include="_extras.py"; -