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/wxe_return.h | |
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/wxe_return.h')
-rw-r--r-- | lib/wx/c_src/wxe_return.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/c_src/wxe_return.h b/lib/wx/c_src/wxe_return.h index b6bfa85e63..80946e2dc6 100644 --- a/lib/wx/c_src/wxe_return.h +++ b/lib/wx/c_src/wxe_return.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 @@ -48,9 +48,9 @@ WX_DECLARE_OBJARRAY(ErlDrvTermData, wxErlDrvTermDataArray); class wxeReturn { public: - wxeReturn (ErlDrvPort _port, - ErlDrvTermData _caller, - bool _isResult=false); + wxeReturn (ErlDrvTermData _port, + ErlDrvTermData _caller, + bool _isResult=false); ~wxeReturn(); @@ -130,7 +130,7 @@ private: // WxeApp* wxe_app; ErlDrvTermData caller; - ErlDrvPort port; + ErlDrvTermData port; // wxeMemEnv *memEnv; wxErlDrvTermDataArray rt; wxArrayDouble temp_float; |