diff options
| author | Dan Gudmundsson <[email protected]> | 2016-11-28 10:29:25 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-11-28 10:29:25 +0100 |
| commit | 40e8a4d37d8505de57ce02c241da856564ee086d (patch) | |
| tree | c8016797832749deb9de9112e82bd16d39d461a9 /lib/wx/api_gen/wx_gen_cpp.erl | |
| parent | ad8c29d74e4cf43f48f2ce11aeea451ad51a7e45 (diff) | |
| parent | 544f9eb04929c7c61fbe97ecd651ac24288d0d12 (diff) | |
| download | otp-40e8a4d37d8505de57ce02c241da856564ee086d.tar.gz otp-40e8a4d37d8505de57ce02c241da856564ee086d.tar.bz2 otp-40e8a4d37d8505de57ce02c241da856564ee086d.zip | |
Merge branch 'maint'
* maint:
wx: Do not dispatch commands after frequent events
Avoid unnecessary length calculations in gl
Add option to send prebuilt binaries to multiDrawArrays
Fix gl driver pointer error
Diffstat (limited to 'lib/wx/api_gen/wx_gen_cpp.erl')
| -rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl index 0a0b1f9209..d4b6db8153 100644 --- a/lib/wx/api_gen/wx_gen_cpp.erl +++ b/lib/wx/api_gen/wx_gen_cpp.erl @@ -1316,7 +1316,8 @@ encode_events(Evs) -> w(" } else {~n"), w(" send_res = rt.send();~n"), w(" if(cb->skip) event->Skip();~n"), - w(" if(app->recurse_level < 1) {~n"), + #class{id=MouseId} = lists:keyfind("wxMouseEvent", #class.name, Evs), + w(" if(app->recurse_level < 1 && Etype->cID != ~p) {~n", [MouseId]), w(" app->recurse_level++;~n"), w(" app->dispatch_cmds();~n"), w(" app->recurse_level--;~n"), |