--- a/windowing/windowserver/test/tauto/TEVENT.H Thu Sep 09 10:13:45 2010 +0300
+++ b/windowing/windowserver/test/tauto/TEVENT.H Fri Sep 17 17:00:49 2010 +0300
@@ -327,10 +327,10 @@
void AddExpectedEvent(TInt aEventCode);
void AddExpectedEvent(TInt aEventCode,RWindowGroup* aWindow);
void AddExpectedErrorMessage(TWsErrorMessage::TErrorCategory aCategory, TInt aError);
- void CalculatePointerEvent(TWsEvent& aEvent,TPointerEvent::TType aType, TPoint aPos);
+ void CalculatePointerEvent(TWsEvent& aEvent,TPointerEvent::TType aType, TPoint aPos, TInt aWindowHandle=0);
void CalculatePointerCaptureEvent(TWsEvent& aEvent,TPointerEvent::TType aType, TPoint aPos, TInt aHandle=0);
- void AddExpectedPointer(TPointerEvent::TType aType, TPoint aPos);
- void AddExpectedPointerCapture(TPointerEvent::TType aType, TPoint aPos, TInt aHandle=0);
+ void AddExpectedPointer(TPointerEvent::TType aType, TPoint aPos, TInt aWindowHandle=0);
+ void AddExpectedPointerCapture(TPointerEvent::TType aType, TPoint aPos, TInt aWindowHandle=0);
void AddExpectedPointerClick(TPointerEvent::TType aType, TPoint aPos);
void AddExpectedPointerDownUp(TPoint aPos);
inline void AddExpectedPointerScr(TPointerEvent::TType aType, TPoint aPos);
@@ -344,6 +344,7 @@
inline void SimulatePointerWin(TRawEvent::TType aType, TInt aX, TInt aY);
inline void SimulatePointerDownUpWin(TInt aX, TInt aY);
inline void SimulatePointer(TRawEvent::TType aType, TInt aX, TInt aY);
+ inline void SimulatePointer(TRawEvent::TType aType, TPoint& aPoint);
void doSendEvent(TWsEvent &aEvent);
void SendKey(TInt aEventCode, TInt aScanCode, TInt aCode=0, TInt iRepeats=0);
void SendEvent(TInt aEventCode);
@@ -373,6 +374,7 @@
#ifndef TEST_GRAPHICS_WSERV_TAUTOSERVER_NONNGA
void SpawnCaptureAppL(RProcess& aProcess);
#endif
+ void SetPointerAcceptanceRegion_NextSetOfEventsL();
private:
CTBlankWindow* iBlankWin;
RBlankWindow iBackingWindow;