aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxEvtHandler.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-07-08 16:09:53 +0200
committerDan Gudmundsson <[email protected]>2015-07-08 16:09:53 +0200
commit3461837363d82e6c908ac81f664da4372aa3a8b0 (patch)
treefe3fc1a577f708f5a5721b0dc7aa74eb5d1e870e /lib/wx/src/gen/wxEvtHandler.erl
parent832aa9e06aced4975c9cb02257f74827602217aa (diff)
parentfcbc24440945a13b379b2b6135599c982bf8bdf0 (diff)
downloadotp-3461837363d82e6c908ac81f664da4372aa3a8b0.tar.gz
otp-3461837363d82e6c908ac81f664da4372aa3a8b0.tar.bz2
otp-3461837363d82e6c908ac81f664da4372aa3a8b0.zip
Merge branch 'dgud/wx/send-asserts-to-erl' into maint
* dgud/wx/send-asserts-to-erl: wx: Add event callback fastpath wx: Event callbacks could hang wx application temporary wx: Make wxLANGUAGE_ variable wx: Send wxWdigets assert to error logger wx: Add mouse_capture_lost event wx: Fix code generator
Diffstat (limited to 'lib/wx/src/gen/wxEvtHandler.erl')
-rw-r--r--lib/wx/src/gen/wxEvtHandler.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/wx/src/gen/wxEvtHandler.erl b/lib/wx/src/gen/wxEvtHandler.erl
index 6e9770bbb6..2d0a87f4dd 100644
--- a/lib/wx/src/gen/wxEvtHandler.erl
+++ b/lib/wx/src/gen/wxEvtHandler.erl
@@ -90,6 +90,8 @@ connect(This=#wx_ref{type=ThisT}, EventType, Options) ->
parse_opts([{callback,Fun}|R], Opts) when is_function(Fun) ->
%% Check Fun Arity?
parse_opts(R, Opts#evh{cb=Fun});
+parse_opts([{callback,CB={nospawn, Fun}}|R], Opts) when is_function(Fun) ->
+ parse_opts(R, Opts#evh{cb=CB});
parse_opts([callback|R], Opts) ->
parse_opts(R, Opts#evh{cb=self()});
parse_opts([{userData, UserData}|R],Opts) ->