wx: Fix cleanup of event handlers

Event handlers was not removed after objects/process had been
delete/died, which causes memory leakage and that fun's was
kept in the wx_server process. Code that might be purged and
the server died.

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 8adec4be07..4968075659 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -880,8 +880,9 @@ wxETreeItemData::~wxETreeItemData()
  * CallbackData *
  * ****************************************************************************/
 
-wxeCallbackData::wxeCallbackData(ErlDrvTermData caller,void * req, char *req_type,
-				 int funcb, int skip_ev, wxeErlTerm * userData)
+wxeCallbackData::wxeCallbackData(ErlDrvTermData caller, int req, char *req_type,
+				 int funcb, int skip_ev, wxeErlTerm * userData,
+				 wxeEvtListener *handler_cb)
   : wxObject()
 {
   listener = caller;
@@ -890,13 +891,26 @@ wxeCallbackData::wxeCallbackData(ErlDrvTermData caller,void * req, char *req_typ
   strcpy(class_name, req_type);
   skip = skip_ev;
   user_data = userData;
+  handler = handler_cb;
 }
 
 wxeCallbackData::~wxeCallbackData() {
-  // fprintf(stderr, "CBD Deleteing %x %s\r\n", (unsigned int) this, class_name); fflush(stderr);
+  // fprintf(stderr, "CBD Deleteing %p %s\r\n", this, class_name); fflush(stderr);
   if(user_data) {
     delete user_data;
   }
+  ptrMap::iterator it;
+  it = ((WxeApp *)wxTheApp)->ptr2ref.find(handler);
+  if(it != ((WxeApp *)wxTheApp)->ptr2ref.end()) {
+    wxeRefData *refd = it->second;
+    wxeReturn rt = wxeReturn(WXE_DRV_PORT, refd->memenv->owner, false);
+    rt.addAtom("wx_delete_cb");
+    rt.addInt(fun_id);
+    rt.addRef(refd->ref, "wxeEvtListener");
+    rt.addRef(obj, class_name);
+    rt.addTupleCount(4);
+    rt.send();
+  }
 }
 
 /* ****************************************************************************