diff options
author | Dan Gudmundsson <[email protected]> | 2015-12-04 12:10:04 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-12-04 12:10:04 +0100 |
commit | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (patch) | |
tree | c9c8735eef6ff80854c2814010f54b30f3d7f50d /lib/wx/api_gen/wx_extra | |
parent | 7b57b86a78f668747cc28e1820a0e6e8474111ea (diff) | |
parent | 80483dcb40c382e38405204370dfac7a8b6513aa (diff) | |
download | otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.tar.gz otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.tar.bz2 otp-7a13283ac6f4a7738dbe2a2ccfce392a820dca2a.zip |
Merge branch 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maint
* dgud/wx/rewrite-cmd-loop/OTP-13160:
wx: Fix some function specifications
wx: Remove call to disconnect_impl from server
wx: Add a command queue check after event sent to erlang
wx: Make wxPostScriptDC optional
wx: Add wxOverlay
wx: Use only one ring buffer for command queue
Diffstat (limited to 'lib/wx/api_gen/wx_extra')
-rw-r--r-- | lib/wx/api_gen/wx_extra/wxEvtHandler.c_src | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src index 5e02066309..08fef1c2ff 100644 --- a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src +++ b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src @@ -42,11 +42,15 @@ case 101: { // wxEvtHandler::Disconnect int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen; if(eventType > 0) { + if(recurse_level > 1) { + delayed_delete->Append(Ecmd.Save()); + } else { bool Result = This->Disconnect((int) *winid,(int) *lastId,eventType, (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, NULL, Listener); rt.addBool(Result); + } } else { rt.addAtom("badarg"); rt.addAtom("event_type"); |