1 files changed, 15 insertions, 2 deletions
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index 1983e6783a..398ceddd4f 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -127,8 +127,21 @@ connect_cb(Object,EvData0 = #evh{cb=Callback}) ->
 
 disconnect_cb(Object,EvData) ->
     Server = (wx:get_env())#wx_env.sv,
-    gen_server:call(Server, {disconnect_cb,Object,EvData}, infinity).
-	
+    {try_in_order, Handlers} =
+	gen_server:call(Server, {disconnect_cb,Object,EvData}, infinity),
+    disconnect(Object, Handlers).
+
+disconnect(Object,[Ev|Evs]) ->
+    try wxEvtHandler:disconnect_impl(Object,Ev) of
+	true ->  true;
+	false -> disconnect(Object, Evs);
+	Error -> Error
+    catch _:_ ->
+	    false
+    end;
+disconnect(_, []) -> false.
+
+
 debug_cast(1, Op, _Args, _Port) ->
     check_previous(),
     case ets:lookup(wx_debug_info,Op) of