From: Vadim Zeitlin Date: Tue, 23 Aug 2011 15:44:04 +0000 (+0000) Subject: Compilation fix for non-OSX: don't use m_rawControlDown there. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c66160d5d566482000a39fe5187dee69e11c9c56 Compilation fix for non-OSX: don't use m_rawControlDown there. m_rawControlDown is supposed to be only used under OS X so put an #ifdef __WXOSX__ around it in wxKeyboardState::GetModifiers() to fix compilation under the other platforms. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/kbdstate.h b/include/wx/kbdstate.h index 93412c975f..b50c2a4fce 100644 --- a/include/wx/kbdstate.h +++ b/include/wx/kbdstate.h @@ -45,7 +45,9 @@ public: return (m_controlDown ? wxMOD_CONTROL : 0) | (m_shiftDown ? wxMOD_SHIFT : 0) | (m_metaDown ? wxMOD_META : 0) | +#ifdef __WXOSX__ (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) | +#endif (m_altDown ? wxMOD_ALT : 0); }