diff options
author | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-12-04 12:13:50 +0100 |
commit | 8fa96128d4a02019463d566e635f774e3fca7c67 (patch) | |
tree | 7fd5088d21b5b85edf4e278af785832dd1315433 /lib/wx/api_gen/wx_gen_cpp.erl | |
parent | 2c2c82d71dd038b347674c31e6b117bc0fec8e2b (diff) | |
parent | 7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (diff) | |
download | otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.gz otp-8fa96128d4a02019463d566e635f774e3fca7c67.tar.bz2 otp-8fa96128d4a02019463d566e635f774e3fca7c67.zip |
Merge branch 'maint'
* maint:
wx: Fix some function specifications
wx: Remove call to disconnect_impl from server
wx: Add a command queue check after event sent to erlang
wx: Make wxPostScriptDC optional
wx: Add wxOverlay
wx: Use only one ring buffer for command queue
Diffstat (limited to 'lib/wx/api_gen/wx_gen_cpp.erl')
-rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl index 5649336b5d..ed7b27f3bf 100644 --- a/lib/wx/api_gen/wx_gen_cpp.erl +++ b/lib/wx/api_gen/wx_gen_cpp.erl @@ -1141,6 +1141,7 @@ gen_macros() -> w("#include <wx/html/htmlcell.h>~n"), w("#include <wx/filename.h>~n"), w("#include <wx/sysopt.h>~n"), + w("#include <wx/overlay.h>~n"), w("~n~n", []), w("#ifndef wxICON_DEFAULT_BITMAP_TYPE~n",[]), @@ -1276,6 +1277,11 @@ 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"), + w(" app->recurse_level++;~n"), + w(" app->dispatch_cmds();~n"), + w(" app->recurse_level--;~n"), + w(" }~n"), w(" };~n"), w(" return send_res;~n"), w(" }~n"). |