diff options
author | Dan Gudmundsson <[email protected]> | 2013-01-25 15:56:56 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2013-01-25 15:56:56 +0100 |
commit | 76648221ddada894b5442c490ea3d9e909320d86 (patch) | |
tree | de8016ed3c9cd40c1098d784ccdcacc0884b6d54 /lib/wx/c_src/gen | |
parent | 697e9178b8c9dc825e221f2750afac516478976a (diff) | |
parent | fd745d01d7efcb11af434acbdbdf2bac11d039c0 (diff) | |
download | otp-76648221ddada894b5442c490ea3d9e909320d86.tar.gz otp-76648221ddada894b5442c490ea3d9e909320d86.tar.bz2 otp-76648221ddada894b5442c490ea3d9e909320d86.zip |
Merge branch 'dgud/wx/depr-driver-if'
* dgud/wx/depr-driver-if:
Document howto build wxWidgets on mac
wx: Fix crash in glu tesselate
wx: Remove deprecated driver_send_term usage
wx: Removed wx internal event
Diffstat (limited to 'lib/wx/c_src/gen')
-rw-r--r-- | lib/wx/c_src/gen/wxe_derived_dest.h | 4 | ||||
-rw-r--r-- | lib/wx/c_src/gen/wxe_events.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h index 5fdce27d4b..8dcaf1c1ac 100644 --- a/lib/wx/c_src/gen/wxe_derived_dest.h +++ b/lib/wx/c_src/gen/wxe_derived_dest.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2012. All Rights Reserved. + * Copyright Ericsson AB 2008-2013. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -391,7 +391,7 @@ class EwxListCtrl : public wxListCtrl { int onGetItemText; int onGetItemAttr; int onGetItemColumnImage; - ErlDrvPort port; + ErlDrvTermData port; private: virtual wxString OnGetItemText(long item, long col) const; diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp index 7a3233a410..c9cdee3160 100644 --- a/lib/wx/c_src/gen/wxe_events.cpp +++ b/lib/wx/c_src/gen/wxe_events.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2012. All Rights Reserved. + * Copyright Ericsson AB 2008-2013. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -328,7 +328,7 @@ int getRef(void* ptr, wxeMemEnv* memenv) return app->getRef(ptr,memenv); } -bool sendevent(wxEvent *event, ErlDrvPort port) +bool sendevent(wxEvent *event, ErlDrvTermData port) { int send_res ; char * evClass = NULL; @@ -815,7 +815,7 @@ case 226: {// wxTaskBarIconEvent rt.addTupleCount(3); pre_callback(); send_res = rt.send(); - if(send_res) handle_event_callback(port, cb->listener); + if(send_res) handle_event_callback(WXE_DRV_PORT_HANDLE, cb->listener); app->clearPtr((void *) event); } else { send_res = rt.send(); |