]> git.saurik.com Git - wxWidgets.git/commitdiff
Compilation fix for non-OSX: don't use m_rawControlDown there.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 23 Aug 2011 15:44:04 +0000 (15:44 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 23 Aug 2011 15:44:04 +0000 (15:44 +0000)
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

include/wx/kbdstate.h

index 93412c975fc178763478a8595a5cfe6e9f1e2018..b50c2a4fce8eeb003baf79bf727a0c756cc78b81 100644 (file)
@@ -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);
     }