X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26e335b844ea77f6b3e62f9daffe7063f2cede7d..a81c3c2383f9096ef5e96b708a0f1c1ffe7cc6a8:/wxPython/src/wx.i diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index 494e0636aa..27d5a3d51a 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,7 +104,6 @@ public: void SetTopWindow(wxWindow* window); void SetVendorName(const wxString& name); void SetUseBestVisual(bool flag); - wxIcon GetStdIcon(int which); }; %inline %{ @@ -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(); @@ -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 ));