--- a/epoc32/include/w32click.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/w32click.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -28,6 +28,9 @@
 #include <w32std.h>
 #endif
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <graphics/pointereventdata.h>
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 class CClickMaker: public CBase
 /** Key or pointer click plug-in provider interface.
@@ -85,7 +88,13 @@
 	plug-in as it does to the window server client and also knowledge 
 	of the screen position may be useful to the plug-in.
 	
-	@param aEvent The pointer event details. */
+	On devices where these features are supported, aEvent will contain pointer number, 
+	proximity of the pointer to the screen and/or pressure applied by the pointer to the screen.
+	In order to retrieve this information, implementation of this method should
+	use TPointerEvent::AdvancedPointerEvent().
+	
+	@param aEvent The pointer event details. 
+	@see TPointerEvent::AdvancedPointerEvent() */
 	virtual void PointerEvent(const TPointerEvent& aEvent)=0;
 
 	/** This function is intended for future expansion of the interface, in case it 
@@ -136,68 +145,6 @@
 	TInt screenDeviceMode;
 	};
 
-class TPointerEventData
-/**
-Passed to a Key Click Plug-in using the function CClickMaker::OtherEvent when the 
-aType value is EEventPointer.
-This includes information about the window the pointer event will be sent to.
-This is the normally the window being clicked on by the user, but pointer capturing 
-and grabbing may affect this.
-
-@publishedAll 
-@released 
-*/
-	{
-public:
-	enum TSource
-		/**
-		A list of locations that WSERV receives events from
-		*/
-		{
-		/** The source is not specified. */
-		EUnspecified,
-		/** The event came from the kernel. */
-		EKernel,
-		/** The event came from a client API. */
-		EClient,
-		/** The event came from an Anim DLL. */
-		EAnimDLL,
-		};
-public:
-	/**
-	The version number of the data passed with EEventPointer, current always 0.
-	*/
-	TInt iVersion;
-	/**
-	The screen position of pointer event.
-	*/
-	TPoint iCurrentPos;
-	/**
-	The full pointer event data previously passed to the CClickMaker::PointerEvent function,
-	except that the iParentPosition will be the actual parent position, when previously passed
-	to the plug-in this value was the screen position.
-	*/
-	TPointerEvent iPointerEvent;
-	/**
-	The client handle of the window or zero if the window is not a client window.
-	*/
-	TUint32 iClientHandle;
-	/**
-	The current top left of the window on the screen.
-	*/
-	TPoint iWindowOrigin;
-	/**
-	The Window Group Identifier of the window group that is a parent (or grand parent etc.)
-	of the window the event is sent to or zero if the window is not a client window.
-	*/
-	TInt iWindowGroupId;
-	/**
-	The source that WSERV recieves the event from,
-	currently set to EUnspecified as this is for future expansion.
-	*/
-	TSource iSource;
-	};
-
 class TGroupWindowOpenData
 /**
 Passed to a Key Click Plug-in using the function CClickMaker::OtherEvent when the