modules/graphics/src/main/native-glass/win/ViewContainer.h

@@ -45,10 +45,14 @@
         jclass                              m_gestureSupportCls;
 
         LPARAM m_lastMouseMovePosition; // or -1
         unsigned int m_mouseButtonDownCounter;
 
+        UINT m_lastTouchInputCount;
+        std::vector<TOUCHINPUT> m_lastTouchInputBuf;
+        std::vector<TOUCHINPUT> m_thisTouchInputBuf;
+
         void WmImeComposition(HWND hwnd, WPARAM wParam, LPARAM lParam);
         void WmImeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam);
         void SendInputMethodEvent(jstring text,
             int cClause, int* rgClauseBoundary,
             int cAttrBlock, int* rgAttrBoundary, BYTE *rgAttrValue,

@@ -65,11 +69,10 @@
         void HandleViewKeyEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
         void HandleViewDeadKeyEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
         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);
 
         void InitDropTarget(HWND hwnd);

@@ -99,10 +102,12 @@
 
         jobject GetView();
 
         void ResetMouseTracking(HWND hwnd);
 
+        unsigned int HandleViewTouchEvent(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+
         void NotifyViewSize(HWND hwnd);
         
         void NotifyGesturePerformed(HWND hWnd, 
             bool isDirect, bool isInertia,
             FLOAT x, FLOAT y,