diff options
| author | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
| commit | ec5bdad811999470d1effd2e8e53942e34738f5c (patch) | |
| tree | cb97f432215bac4a5d59146f77da7ef65528ab95 /lib/wx/c_src/gen/wxe_events.cpp | |
| parent | e10d2cf8e16c6e42947f9d6b4383bf77c0f7c564 (diff) | |
| parent | 5ce5cc6c49ac06d282519494e8047498a7d985e0 (diff) | |
| download | otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.gz otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.bz2 otp-ec5bdad811999470d1effd2e8e53942e34738f5c.zip | |
Merge branch 'dgud/wx/prefer-wxMSW-3/OTP-12632'
* dgud/wx/prefer-wxMSW-3/OTP-12632:
wx: Fix variable cursor constants
wx: On Mac keyboards use meta field as raw_ctrl
wx: Prefer wxWidgets-3.0. branch on windows
Diffstat (limited to 'lib/wx/c_src/gen/wxe_events.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_events.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp index 255b36c2fa..ae85931d8d 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-2014. All Rights Reserved. + * Copyright Ericsson AB 2008-2015. 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 @@ -394,7 +394,11 @@ case 167: {// wxMouseEvent rt.addBool(ev->m_controlDown); rt.addBool(ev->m_shiftDown); rt.addBool(ev->m_altDown); +#if wxCHECK_VERSION(2,9,0) && defined(_MACOSX) + rt.addBool(ev->m_rawControlDown); +#else rt.addBool(ev->m_metaDown); +#endif rt.addInt(ev->m_wheelRotation); rt.addInt(ev->m_wheelDelta); rt.addInt(ev->m_linesPerAction); @@ -419,7 +423,11 @@ case 169: {// wxKeyEvent rt.addBool(ev->m_controlDown); rt.addBool(ev->m_shiftDown); rt.addBool(ev->m_altDown); +#if wxCHECK_VERSION(2,9,0) && defined(_MACOSX) + rt.addBool(ev->m_rawControlDown); +#else rt.addBool(ev->m_metaDown); +#endif #if !wxCHECK_VERSION(2,9,0) rt.addBool(ev->m_scanCode); #else |