X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26e335b844ea77f6b3e62f9daffe7063f2cede7d..e422162882bf4c5ae743fd618864e97206765fca:/wxPython/src/wx.i diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index 494e0636aa..bca4da7820 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -17,7 +17,6 @@ #include "helpers.h" %} - //---------------------------------------------------------------------- // This is where we include the other wrapper definition files for SWIG //---------------------------------------------------------------------- @@ -47,6 +46,8 @@ %import streams.i %import filesys.i %import utils.i +%import fonts.i + %native(_wxStart) __wxStart; %native(_wxSetDictionary) __wxSetDictionary; @@ -103,17 +104,16 @@ public: void SetTopWindow(wxWindow* window); void SetVendorName(const wxString& name); void SetUseBestVisual(bool flag); - wxIcon GetStdIcon(int which); }; %inline %{ wxPyApp* wxGetApp() { - return wxPythonApp; + //return wxPythonApp; + return (wxPyApp*)wxTheApp; } %} - //---------------------------------------------------------------------- // this is used to cleanup after wxWindows when Python shuts down. @@ -150,6 +150,7 @@ extern "C" SWIGEXPORT(void) initclip_dndc(); extern "C" SWIGEXPORT(void) initstreamsc(); extern "C" SWIGEXPORT(void) initfilesysc(); extern "C" SWIGEXPORT(void) initutilsc(); +extern "C" SWIGEXPORT(void) initfontsc(); @@ -157,12 +158,12 @@ extern "C" SWIGEXPORT(void) initutilsc(); // 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,11 @@ static wxPyCoreAPI API = { wxPyMake_wxSizer, wxPyPtrTypeMap_Add, wxArrayString2PyList_helper, - wxArrayInt2PyList_helper + wxArrayInt2PyList_helper, + + wxPyClientData_dtor, + wxPyUserData_dtor, + wxPyOORClientData_dtor }; @@ -244,6 +249,7 @@ static wxPyCoreAPI API = { initstreamsc(); initfilesysc(); initutilsc(); + initfontsc(); PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION )); @@ -266,4 +272,3 @@ static wxPyCoreAPI API = { %pragma(python) include="_extras.py"; -