1 files changed, 16 insertions, 26 deletions

diff --git a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
index 4e492db045..5d20019d8f 100644
--- a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
+++ b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
@@ -1,17 +1,5 @@
-case 98:  { // wxeEvtListener::wxeEvtListener
-  wxeEvtListener *Result = new wxeEvtListener(Ecmd.port);
-  rt.addRef(getRef((void *)Result,memenv), "wxeEvtListener");
-  break;
-}
-case 99:  { // wxeEvtListener::destroy
-  wxObject *This = (wxObject *) getPtr(bp,memenv); 
-  rt.addAtom("ok");
-  delete This; 
-  break;
-} 
 
-case 100: { // wxEvtHandler::Connect 
-  wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
+case 100: { // wxEvtHandler::Connect
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
   int * lastId = (int *) bp; bp += 4;
@@ -22,20 +10,22 @@ case 100: { // wxEvtHandler::Connect
   int * eventTypeLen = (int *) bp; bp += 4;
   int * class_nameLen = (int *) bp; bp += 4;
 
-  if(*haveUserData) {    
+  if(*haveUserData) {
       userData = new wxeErlTerm(Ecmd.bin[0]);
   }
 
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   char *class_name = bp; bp+= *class_nameLen;
   if(eventType > 0 ) {
-     wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,(void *) This,
-     		       	      	    		    class_name,*fun_cb, 
-		                                    *skip, userData);
-     This->Connect((int) *winid,(int) *lastId,eventType, 
-	           (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, 
-	           Evt_cb, Listener);
-     rt.addAtom("ok");
+    wxeEvtListener * Evt_cb = new wxeEvtListener(Ecmd.caller,getRef(This, memenv),
+                                                 class_name,*fun_cb,
+                                                 *skip, userData, Ecmd.port);
+    This->Connect((int) *winid,(int) *lastId,eventType,
+	          (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward,
+	          Evt_cb, Evt_cb);
+    rt.addAtom("ok");
+    rt.addRef(getRef((void *)Evt_cb,memenv), "wxeEvtListener");
+    rt.addTupleCount(2);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
@@ -43,7 +33,7 @@ case 100: { // wxEvtHandler::Connect
   }
   break;
 }
-case 101: { // wxEvtHandler::Disconnect 
+case 101: { // wxEvtHandler::Disconnect
   wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
@@ -53,14 +43,14 @@ case 101: { // wxEvtHandler::Disconnect
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   if(eventType > 0) {
      bool Result = This->Disconnect((int) *winid,(int) *lastId,eventType,
-  				    (wxObjectEventFunction)(wxEventFunction) 
-				    &wxeEvtListener::forward, 
-				    NULL, Listener);
+                                    (wxObjectEventFunction)(wxEventFunction)
+                                    &wxeEvtListener::forward,
+                                    NULL, Listener);
      rt.addBool(Result);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
-    rt.addTupleCount(2);    
+    rt.addTupleCount(2);
   }
   break;
 }