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/api_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/api_gen')
| -rw-r--r-- | lib/wx/api_gen/wx_extra/wxListCtrl.c_src | 4 | ||||
| -rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src index 54d6fafd01..8fa31e512e 100644 --- a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src +++ b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011. All Rights Reserved. +%% Copyright Ericsson AB 2011-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 @@ -27,7 +27,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/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl index 293c97507e..f00fc0c720 100644 --- a/lib/wx/api_gen/wx_gen_cpp.erl +++ b/lib/wx/api_gen/wx_gen_cpp.erl @@ -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 @@ -1210,7 +1210,7 @@ encode_events(Evs) -> " WxeApp * app = (WxeApp *) wxTheApp;~n" " return app->getRef(ptr,memenv);~n" "}~n~n"), - w("bool sendevent(wxEvent *event, ErlDrvPort port)~n{~n" + w("bool sendevent(wxEvent *event, ErlDrvTermData port)~n{~n" " int send_res ;~n" " char * evClass = NULL;~n" " wxMBConvUTF32 UTFconverter;~n" @@ -1239,7 +1239,7 @@ encode_events(Evs) -> w(" rt.addTupleCount(3);~n"), w(" pre_callback();~n"), w(" send_res = rt.send();~n"), - w(" if(send_res) handle_event_callback(port, cb->listener);~n"), + w(" if(send_res) handle_event_callback(WXE_DRV_PORT_HANDLE, cb->listener);~n"), w(" app->clearPtr((void *) event);~n"), w(" } else {~n"), w(" send_res = rt.send();~n"), |