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/src/wxe_server.erl | |
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/src/wxe_server.erl')
-rw-r--r-- | lib/wx/src/wxe_server.erl | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl index cc253b1143..ae9440f890 100644 --- a/lib/wx/src/wxe_server.erl +++ b/lib/wx/src/wxe_server.erl @@ -352,25 +352,8 @@ handle_disconnect(Object, Evh = #evh{cb=Fun}, From, State0 = #state{users=Users0, cb=Callbacks}) -> #user{events=Evs0} = gb_trees:get(From, Users0), FunId = gb_trees:lookup(Fun, Callbacks), - case find_handler(Evs0, Object, Evh#evh{cb=FunId}) of - [] -> - {reply, false, State0}; - Handlers -> - case disconnect(Object,Handlers) of - #evh{} -> {reply, true, State0}; - Result -> {reply, Result, State0} - end - end. - -disconnect(Object,[Ev|Evs]) -> - try wxEvtHandler:disconnect_impl(Object,Ev) of - true -> Ev; - false -> disconnect(Object, Evs); - Error -> Error - catch _:_ -> - false - end; -disconnect(_, []) -> false. + Handlers = find_handler(Evs0, Object, Evh#evh{cb=FunId}), + {reply, {try_in_order, Handlers}, State0}. find_handler([{Object,Evh}|Evs], Object, Match) -> case match_handler(Match, Evh) of |