diff options
| author | Dan Gudmundsson <[email protected]> | 2013-12-02 09:53:23 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-12-02 09:53:23 +0100 |
| commit | f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f (patch) | |
| tree | c3f662766f6b0a1303c96dca3281fe82d1ea84ae /lib/wx/c_src/gen/wxe_funcs.cpp | |
| parent | 98a4eb6dd4dae98121da294a87bb5cf077b9efa7 (diff) | |
| parent | d3e5761436cfbcb5b53edad9e1140e445ce94bfd (diff) | |
| download | otp-f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f.tar.gz otp-f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f.tar.bz2 otp-f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/c_src/gen/wxe_funcs.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index 2d8dbb242b..b5fbac3fe0 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -93,13 +93,13 @@ case 100: { // wxEvtHandler::Connect int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen; char *class_name = bp; bp+= *class_nameLen; if(eventType > 0 ) { - wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,(void *) This, - class_name,*fun_cb, - *skip, userData); - This->Connect((int) *winid,(int) *lastId,eventType, - (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, - Evt_cb, Listener); - rt.addAtom("ok"); + wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,getRef(This, memenv), + class_name,*fun_cb, + *skip, userData, Listener); + This->Connect((int) *winid,(int) *lastId,eventType, + (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, + Evt_cb, Listener); + rt.addAtom("ok"); } else { rt.addAtom("badarg"); rt.addAtom("event_type"); @@ -15137,7 +15137,7 @@ case wxListBox_Set: { // wxListBox::Set } bp += (8-((0+ itemsASz) & 7 )) & 7; if(!This) throw wxe_badarg(0); - This->Set(items,(void **) NULL); + This->Set(items); break; } case wxListBox_HitTest: { // wxListBox::HitTest |