Make sure separation between modifier keys is communicated from GHOST upwards too...

[blender-staging.git] / intern / ghost / intern / GHOST_SystemWin32.h

diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index ab2f34cc27a7a3b25658d77e83c8b7f892bdb41e..88705fe2ce441d3f7a8af826740d032ffecfbc0e 100644 (file)
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -248,7 +248,7 @@ protected:
         * events generated for both keys.
         * @param window        The window receiving the event (the active window).
         */
-       GHOST_EventKey* processModifierKeys(GHOST_IWindow *window);
+       //GHOST_EventKey* processModifierKeys(GHOST_IWindow *window);
 
        /**
         * Creates mouse button event.
@@ -314,7 +314,7 @@ protected:
        /**
         * Check current key layout for AltGr
         */
-       inline virtual void keyboardAltGr();
+       inline virtual void keyboardAltGr(void);
 
        /**
         * Windows call back routine for our window class.
@@ -325,6 +325,11 @@ protected:
         * Low-level inspection of keyboard events
         */
        static LRESULT CALLBACK s_llKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
+       
+       /**
+        * Check if any shiftkey is pressed
+        */
+       inline virtual bool shiftPressed(void);
 
        /** The current state of the modifier keys. */
        GHOST_ModifierKeys m_modifierKeys;
@@ -352,7 +357,7 @@ inline void GHOST_SystemWin32::storeModifierKeys(const GHOST_ModifierKeys& keys)
        m_modifierKeys = keys;
 }
 
-inline void GHOST_SystemWin32::keyboardAltGr()
+inline void GHOST_SystemWin32::keyboardAltGr(void)
 {
        HKL keylayout = GetKeyboardLayout(0); // get keylayout for current thread
        int i;
@@ -369,5 +374,10 @@ inline void GHOST_SystemWin32::keyboardAltGr()
        }
 }
 
+inline bool GHOST_SystemWin32::shiftPressed(void)
+{
+       return (m_curKeyStatus[VK_SHIFT] || m_curKeyStatus[VK_RSHIFT] || m_curKeyStatus[VK_LSHIFT]);
+}
+
 #endif // _GHOST_SYSTEM_WIN32_H_