1.1 --- a/epoc32/include/w32click.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/w32click.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// 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
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -28,6 +28,9 @@
    1.16  #include <w32std.h>
    1.17  #endif
    1.18  
    1.19 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.20 +#include <graphics/pointereventdata.h>
    1.21 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
    1.22  
    1.23  class CClickMaker: public CBase
    1.24  /** Key or pointer click plug-in provider interface.
    1.25 @@ -85,7 +88,13 @@
    1.26  	plug-in as it does to the window server client and also knowledge 
    1.27  	of the screen position may be useful to the plug-in.
    1.28  	
    1.29 -	@param aEvent The pointer event details. */
    1.30 +	On devices where these features are supported, aEvent will contain pointer number, 
    1.31 +	proximity of the pointer to the screen and/or pressure applied by the pointer to the screen.
    1.32 +	In order to retrieve this information, implementation of this method should
    1.33 +	use TPointerEvent::AdvancedPointerEvent().
    1.34 +	
    1.35 +	@param aEvent The pointer event details. 
    1.36 +	@see TPointerEvent::AdvancedPointerEvent() */
    1.37  	virtual void PointerEvent(const TPointerEvent& aEvent)=0;
    1.38  
    1.39  	/** This function is intended for future expansion of the interface, in case it 
    1.40 @@ -136,68 +145,6 @@
    1.41  	TInt screenDeviceMode;
    1.42  	};
    1.43  
    1.44 -class TPointerEventData
    1.45 -/**
    1.46 -Passed to a Key Click Plug-in using the function CClickMaker::OtherEvent when the 
    1.47 -aType value is EEventPointer.
    1.48 -This includes information about the window the pointer event will be sent to.
    1.49 -This is the normally the window being clicked on by the user, but pointer capturing 
    1.50 -and grabbing may affect this.
    1.51 -
    1.52 -@publishedAll 
    1.53 -@released 
    1.54 -*/
    1.55 -	{
    1.56 -public:
    1.57 -	enum TSource
    1.58 -		/**
    1.59 -		A list of locations that WSERV receives events from
    1.60 -		*/
    1.61 -		{
    1.62 -		/** The source is not specified. */
    1.63 -		EUnspecified,
    1.64 -		/** The event came from the kernel. */
    1.65 -		EKernel,
    1.66 -		/** The event came from a client API. */
    1.67 -		EClient,
    1.68 -		/** The event came from an Anim DLL. */
    1.69 -		EAnimDLL,
    1.70 -		};
    1.71 -public:
    1.72 -	/**
    1.73 -	The version number of the data passed with EEventPointer, current always 0.
    1.74 -	*/
    1.75 -	TInt iVersion;
    1.76 -	/**
    1.77 -	The screen position of pointer event.
    1.78 -	*/
    1.79 -	TPoint iCurrentPos;
    1.80 -	/**
    1.81 -	The full pointer event data previously passed to the CClickMaker::PointerEvent function,
    1.82 -	except that the iParentPosition will be the actual parent position, when previously passed
    1.83 -	to the plug-in this value was the screen position.
    1.84 -	*/
    1.85 -	TPointerEvent iPointerEvent;
    1.86 -	/**
    1.87 -	The client handle of the window or zero if the window is not a client window.
    1.88 -	*/
    1.89 -	TUint32 iClientHandle;
    1.90 -	/**
    1.91 -	The current top left of the window on the screen.
    1.92 -	*/
    1.93 -	TPoint iWindowOrigin;
    1.94 -	/**
    1.95 -	The Window Group Identifier of the window group that is a parent (or grand parent etc.)
    1.96 -	of the window the event is sent to or zero if the window is not a client window.
    1.97 -	*/
    1.98 -	TInt iWindowGroupId;
    1.99 -	/**
   1.100 -	The source that WSERV recieves the event from,
   1.101 -	currently set to EUnspecified as this is for future expansion.
   1.102 -	*/
   1.103 -	TSource iSource;
   1.104 -	};
   1.105 -
   1.106  class TGroupWindowOpenData
   1.107  /**
   1.108  Passed to a Key Click Plug-in using the function CClickMaker::OtherEvent when the