SWIGged code update for wxGTK

[wxWidgets.git] / wxPython / src / wx.i

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index a9078d9b448d3ef7ee3c1eb60fb572ad6f67cacc..b052ac0dcc73cc1c37da1cb2097c323513e16641 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -17,6 +17,11 @@
 #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
 //----------------------------------------------------------------------
@@ -54,8 +59,10 @@
 
 #define __version__ "0.0.0"   // The real value is now in setup.py...
 
-wxPoint     wxPyDefaultPosition;
-wxSize      wxPyDefaultSize;
+%readonly
+wxPoint     wxDefaultPosition;
+wxSize      wxDefaultSize;
+%readwrite
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -110,6 +117,8 @@ public:
     }
 %}
 
+
+
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 
@@ -159,8 +168,9 @@ static wxPyCoreAPI API = {
     SWIG_addvarlink,
     SWIG_newvarlink,
 
-    wxPySaveThread,
-    wxPyRestoreThread,
+    wxPyBeginBlockThreads,
+    wxPyEndBlockThreads,
+
     wxPyConstructObject,
     wxPy_ConvertList,
 
@@ -179,13 +189,20 @@ static wxPyCoreAPI API = {
     wxRect_helper,
     wxColour_helper,
 
-    wxPyCBH_setSelf,
+    wxPyCBH_setCallbackInfo,
     wxPyCBH_findCallback,
     wxPyCBH_callCallback,
     wxPyCBH_callCallbackObj,
     wxPyCBH_delete,
+
+    wxPyClassExists,
+    wxPyMake_wxObject,
+    wxPyMake_wxSizer,
+    wxPyPtrTypeMap_Add,
+    wxArrayString2PyList_helper
 };
 
+
 %}
 
 
@@ -224,6 +241,14 @@ static wxPyCoreAPI API = {
     initstreamsc();
     initfilesysc();
 
+
+    PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long)wxMAJOR_VERSION ));
+    PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION ));
+    PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER ));
+    PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
+    PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
+
+
 %}
 
 //----------------------------------------------------------------------