X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3fbed81b2165fddbbf2ee7eddd6089b62db3692..ff42dd66503f732fcb1d4fac60240a62ec2f7628:/wxPython/src/wx.i?ds=sidebyside

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index da1553eb92..d9f79e7041 100644
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,11 +12,15 @@
 
 %module wx
 
-
 %{
 #include "helpers.h"
 %}
 
+//  %pragma(python) code="
+//  # This gives this module's dictionary to the C++ extension code...
+//  wxc._wxSetDictionary(vars())
+//  "
+
 //----------------------------------------------------------------------
 // This is where we include the other wrapper definition files for SWIG
 //----------------------------------------------------------------------
@@ -45,6 +49,7 @@
 %import sizers.i
 %import streams.i
 %import filesys.i
+%import utils.i
 
 %native(_wxStart)           __wxStart;
 %native(_wxSetDictionary)   __wxSetDictionary;
@@ -102,8 +107,6 @@ public:
     void SetVendorName(const wxString& name);
     void SetUseBestVisual(bool flag);
     wxIcon GetStdIcon(int which);
-
-
 };
 
 %inline %{
@@ -112,6 +115,8 @@ public:
     }
 %}
 
+
+
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 
@@ -147,6 +152,7 @@ extern "C" SWIGEXPORT(void) initsizersc();
 extern "C" SWIGEXPORT(void) initclip_dndc();
 extern "C" SWIGEXPORT(void) initstreamsc();
 extern "C" SWIGEXPORT(void) initfilesysc();
+extern "C" SWIGEXPORT(void) initutilsc();
 
 
 
@@ -161,8 +167,11 @@ static wxPyCoreAPI API = {
     SWIG_addvarlink,
     SWIG_newvarlink,
 
-    wxPySaveThread,
-    wxPyRestoreThread,
+    wxPyBeginAllowThreads,
+    wxPyEndAllowThreads,
+    wxPyBeginBlockThreads,
+    wxPyEndBlockThreads,
+
     wxPyConstructObject,
     wxPy_ConvertList,
 
@@ -181,7 +190,7 @@ static wxPyCoreAPI API = {
     wxRect_helper,
     wxColour_helper,
 
-    wxPyCBH_setSelf,
+    wxPyCBH_setCallbackInfo,
     wxPyCBH_findCallback,
     wxPyCBH_callCallback,
     wxPyCBH_callCallbackObj,
@@ -189,7 +198,10 @@ static wxPyCoreAPI API = {
 
     wxPyClassExists,
     wxPyMake_wxObject,
+    wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,
+    wxArrayString2PyList_helper,
+    wxArrayInt2PyList_helper
 };
 
 
@@ -230,6 +242,7 @@ static wxPyCoreAPI API = {
     initclip_dndc();
     initstreamsc();
     initfilesysc();
+    initutilsc();
 
 
     PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));