diff options
| author | Dan Gudmundsson <[email protected]> | 2016-11-28 10:28:06 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-11-28 10:28:06 +0100 |
| commit | 544f9eb04929c7c61fbe97ecd651ac24288d0d12 (patch) | |
| tree | ef0363e3d95b615c8398080a2592467d2b4a61ff /lib/wx/api_gen/wx_gen_cpp.erl | |
| parent | f8aef2dcae7162b59efb9513442c9643c9f5159e (diff) | |
| parent | 3c5f019a3a69d4d18c40dccaa91f522f85c9c92a (diff) | |
| download | otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.tar.gz otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.tar.bz2 otp-544f9eb04929c7c61fbe97ecd651ac24288d0d12.zip | |
Merge branch 'dgud/wx/gl-bugs' into maint
* dgud/wx/gl-bugs:
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"), |