aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/c_src/gen/wxe_events.cpp
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-01-13 10:57:46 +0100
committerDan Gudmundsson <[email protected]>2015-03-27 09:55:50 +0100
commit29049ab976919460356b047baa854aadee780f5a (patch)
treef5d471b801919d79b27c7cead46d6df49520f391 /lib/wx/c_src/gen/wxe_events.cpp
parent830652f64fb17ae37743c2571586ab0e0518d679 (diff)
downloadotp-29049ab976919460356b047baa854aadee780f5a.tar.gz
otp-29049ab976919460356b047baa854aadee780f5a.tar.bz2
otp-29049ab976919460356b047baa854aadee780f5a.zip
wx: On Mac keyboards use meta field as raw_ctrl
On mac and wxWidgets-3.0 the crtlDown field in keyboard and mouse events are set when command button is pressed. The ctrl key on mac keyboard is in a field called raw_control as this would be backward incompatible to add we reuse the metaDown field as indicator when the ctrl keyboard button is pressed.
Diffstat (limited to 'lib/wx/c_src/gen/wxe_events.cpp')
-rw-r--r--lib/wx/c_src/gen/wxe_events.cpp10
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