suppress an assert when a combobox receives WM_KILLFOCUS while it is being destroyed

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

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index f51a623b6db84aa5df18c551815b5d77f6495b84..d4a129b90c6a6e52f8ac2f710aac1b86047e3dae 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,6 +12,7 @@
 
 %module wx
 
+
 %{
 #include "helpers.h"
 %}
@@ -107,12 +108,12 @@ public:
 
 %inline %{
     wxPyApp* wxGetApp() {
-        return wxPythonApp;
+        //return wxPythonApp;
+        return (wxPyApp*)wxTheApp;
     }
 %}
 
 
-
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.
 
@@ -202,7 +203,11 @@ static wxPyCoreAPI API = {
     wxPyMake_wxSizer,
     wxPyPtrTypeMap_Add,
     wxArrayString2PyList_helper,
-    wxArrayInt2PyList_helper
+    wxArrayInt2PyList_helper,
+
+    wxPyClientData_dtor,
+    wxPyUserData_dtor,
+    wxPyOORClientData_dtor
 };
 
 
@@ -267,4 +272,3 @@ static wxPyCoreAPI API = {
 
 %pragma(python) include="_extras.py";
 
-