aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/api_gen
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-05-05 09:31:18 +0200
committerDan Gudmundsson <[email protected]>2015-05-05 09:31:18 +0200
commit676500a8042165ae3391275fb638471a5a05b25f (patch)
treef38c152677c66e13c4bf79df0dd46e5140812441 /lib/wx/api_gen
parent727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd (diff)
parent60229a03667a9bac8917a78c922bec4885d2d53f (diff)
downloadotp-676500a8042165ae3391275fb638471a5a05b25f.tar.gz
otp-676500a8042165ae3391275fb638471a5a05b25f.tar.bz2
otp-676500a8042165ae3391275fb638471a5a05b25f.zip
Merge branch 'dgud/wx/optimize-queues'
* dgud/wx/optimize-queues: wx: Fix delete object wx: Optimize command queues wx: Optimize OpenGL invocations
Diffstat (limited to 'lib/wx/api_gen')
-rw-r--r--lib/wx/api_gen/wx_gen_cpp.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 720526b3b9..8e32aeddc8 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -197,8 +197,8 @@ gen_funcs(Defs) ->
w(" if(recurse_level > 1 && refd->type != 4) {~n"),
w(" delayed_delete->Append(Ecmd.Save());~n"),
w(" } else {~n"),
- w(" ((WxeApp *) wxTheApp)->clearPtr(This);~n"),
- w(" delete_object(This, refd); }~n"),
+ w(" delete_object(This, refd);~n"),
+ w(" ((WxeApp *) wxTheApp)->clearPtr(This);}~n"),
w(" } } break;~n"),
w(" case WXE_REGISTER_OBJECT: {~n"
" registerPid(bp, Ecmd.caller, memenv);~n"