diff options
| author | Dan Gudmundsson <[email protected]> | 2014-06-16 12:17:44 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-06-16 12:17:44 +0200 |
| commit | 4ed5f977ccb48a393fa128283496ac2a24bd11af (patch) | |
| tree | cd2432d5b289a84d3575202f8d34eeaeb1ffd7e6 /lib/wx/c_src/wxe_impl.cpp | |
| parent | a2a82c3dcf35b9a8e977a35e01a18936be22ea00 (diff) | |
| parent | a432f076a6e4a515f1aaf8b786367d5a62ce416a (diff) | |
| download | otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.tar.gz otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.tar.bz2 otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/c_src/wxe_impl.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index f617aaf349..0ee52e3af2 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -500,7 +500,7 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) if(it != ptr2ref.end()) { wxeRefData *refd = it->second; if(refd->alloc_in_erl) { - if((refd->type == 1) && ((wxObject *)ptr)->IsKindOf(CLASSINFO(wxBufferedDC))) { + if((refd->type == 4) && ((wxObject *)ptr)->IsKindOf(CLASSINFO(wxBufferedDC))) { ((wxBufferedDC *)ptr)->m_dc = NULL; // Workaround } wxString msg; @@ -539,6 +539,17 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) refmap.erase((ErlDrvTermData) Ecmd.port); } + +wxeRefData * WxeApp::getRefData(void *ptr) { + ptrMap::iterator it = ptr2ref.find(ptr); + if(it != ptr2ref.end()) { + wxeRefData *refd = it->second; + return refd; + } + return NULL; +} + + wxeMemEnv * WxeApp::getMemEnv(ErlDrvTermData port) { return refmap[port]; } |