--- old/modules/graphics/src/main/native-glass/win/ViewContainer.h 2015-05-26 13:37:14.092941645 -0400 +++ new/modules/graphics/src/main/native-glass/win/ViewContainer.h 2015-05-26 13:37:13.908943958 -0400 @@ -47,6 +47,10 @@ LPARAM m_lastMouseMovePosition; // or -1 unsigned int m_mouseButtonDownCounter; + UINT m_lastTouchInputCount; + std::vector m_lastTouchInputBuf; + std::vector m_thisTouchInputBuf; + void WmImeComposition(HWND hwnd, WPARAM wParam, LPARAM lParam); void WmImeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam); void SendInputMethodEvent(jstring text, @@ -67,7 +71,6 @@ void HandleViewTypedEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); BOOL HandleViewMouseEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); BOOL HandleViewInputMethodEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); - void HandleViewTouchEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT HandleViewGetAccessible(HWND hwnd, WPARAM wParam, LPARAM lParam); virtual void HandleViewTimerEvent(HWND hwnd, UINT_PTR timerID); @@ -101,6 +104,8 @@ void ResetMouseTracking(HWND hwnd); + unsigned int HandleViewTouchEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + void NotifyViewSize(HWND hwnd); void NotifyGesturePerformed(HWND hWnd,