diff options
| author | Dan Gudmundsson <[email protected]> | 2015-07-08 16:13:13 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-07-08 16:13:13 +0200 |
| commit | e16d2a78e6e60dcc57867748ae809e448ef578e4 (patch) | |
| tree | 39c92df6d1e50cb65cfdf1049cc0c0074375d708 /lib/wx/src/gen/wxEvtHandler.erl | |
| parent | 9ebb4472d9cbe0dc907c894231ce1f61a04fa0b6 (diff) | |
| parent | 3461837363d82e6c908ac81f664da4372aa3a8b0 (diff) | |
| download | otp-e16d2a78e6e60dcc57867748ae809e448ef578e4.tar.gz otp-e16d2a78e6e60dcc57867748ae809e448ef578e4.tar.bz2 otp-e16d2a78e6e60dcc57867748ae809e448ef578e4.zip | |
Merge branch 'maint'
* maint:
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.erl | 2 |
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) -> |