diff options
author | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
commit | 8fa96128d4a02019463d566e635f774e3fca7c67 (patch) | |
tree | 7fd5088d21b5b85edf4e278af785832dd1315433 /lib/wx/api_gen/wx_extra/wxEvtHandler.c_src | |
parent | 2c2c82d71dd038b347674c31e6b117bc0fec8e2b (diff) | |
parent | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (diff) | |
download | otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.gz otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.bz2 otp-8fa96128d4a02019463d566e635f774e3fca7c67.zip |
Merge branch 'maint'
* maint:
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/wxEvtHandler.c_src')
-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"); |