diff options
| author | Dan Gudmundsson <[email protected]> | 2014-02-14 09:52:51 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-02-14 09:52:51 +0100 |
| commit | 50093842d6e916a76e4ed42263b1b3f9489d896e (patch) | |
| tree | 189db72c1c2c126632ec592e7dfd2e6078b79851 /lib/wx/c_src/gen/wxe_events.cpp | |
| parent | d10a115ab1e66938531b87bef20f886013e7b96b (diff) | |
| parent | 7f68f9862f133e07e4b847c91c52fcf81aee79d5 (diff) | |
| download | otp-50093842d6e916a76e4ed42263b1b3f9489d896e.tar.gz otp-50093842d6e916a76e4ed42263b1b3f9489d896e.tar.bz2 otp-50093842d6e916a76e4ed42263b1b3f9489d896e.zip | |
Merge branch 'dgud/wx/fix-cb-cleanup/OTP-11699'
* dgud/wx/fix-cb-cleanup/OTP-11699:
wx: Test fixes compilation warning
wx: Do not warn for our own deprecated functions
wx: Rewrite eventhandling again
Diffstat (limited to 'lib/wx/c_src/gen/wxe_events.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_events.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp index a1b4d090b3..1bd17366a2 100644 --- a/lib/wx/c_src/gen/wxe_events.cpp +++ b/lib/wx/c_src/gen/wxe_events.cpp @@ -316,16 +316,6 @@ void initEventTable() } } -void wxeEvtListener::forward(wxEvent& event) -{ -#ifdef DEBUG - if(!sendevent(&event, port)) - fprintf(stderr, "Couldn't send event!\r\n"); -#else -sendevent(&event, port); -#endif -} - int getRef(void* ptr, wxeMemEnv* memenv) { WxeApp * app = (WxeApp *) wxTheApp; @@ -338,7 +328,7 @@ bool sendevent(wxEvent *event, ErlDrvTermData port) char * evClass = NULL; wxMBConvUTF32 UTFconverter; wxeEtype *Etype = etmap[event->GetEventType()]; - wxeCallbackData *cb = (wxeCallbackData *)event->m_callbackUserData; + wxeEvtListener *cb = (wxeEvtListener *)event->m_callbackUserData; WxeApp * app = (WxeApp *) wxTheApp; wxeMemEnv *memenv = app->getMemEnv(port); if(!memenv) return 0; |