diff options
author | Dan Gudmundsson <[email protected]> | 2018-12-03 09:36:50 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2018-12-03 09:36:50 +0100 |
commit | d5632bfb023ac2c0ae25783f7eae3b060164de0b (patch) | |
tree | a3a9e7fa348f23a196b89a3425d83133b61f51f0 /lib/wx/c_src/wxe_impl.cpp | |
parent | 2eeab3cc011ec503d7831fe588557f60d69aa8be (diff) | |
parent | 2634c45c63dc6038ab9c738e9ab8ace490802f6d (diff) | |
download | otp-d5632bfb023ac2c0ae25783f7eae3b060164de0b.tar.gz otp-d5632bfb023ac2c0ae25783f7eae3b060164de0b.tar.bz2 otp-d5632bfb023ac2c0ae25783f7eae3b060164de0b.zip |
Merge branch 'dgud/wx/mojave-crash/OTP-15426' into maint
* dgud/wx/mojave-crash/OTP-15426:
wx: Do not delay deletes of wxGraphicContext
Diffstat (limited to 'lib/wx/c_src/wxe_impl.cpp')
-rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index 1510866f09..f856099ffa 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -591,7 +591,7 @@ int WxeApp::newPtr(void * ptr, int type, wxeMemEnv *memenv) { return ref; } -int WxeApp::getRef(void * ptr, wxeMemEnv *memenv) { +int WxeApp::getRef(void * ptr, wxeMemEnv *memenv, int type) { if(!ptr) return 0; // NULL and zero is the same ptrMap::iterator it = ptr2ref.find(ptr); if(it != ptr2ref.end()) { @@ -618,7 +618,7 @@ int WxeApp::getRef(void * ptr, wxeMemEnv *memenv) { } memenv->ref2ptr[ref] = ptr; - ptr2ref[ptr] = new wxeRefData(ref, 0, false, memenv); + ptr2ref[ptr] = new wxeRefData(ref, type, false, memenv); return ref; } |