1.1 --- a/epoc32/include/mw/coecntrl.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/coecntrl.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1997-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 @@ -35,7 +35,7 @@
    1.16  class TResourceReader;
    1.17  class CCoeEnv;
    1.18  class MCoeControlContext;
    1.19 -class RCoeDynamicDataStorage;
    1.20 +class CCoeControlStorage;
    1.21  
    1.22  class MCoeLayoutManager;
    1.23  class TCoeZoomWithType; 
    1.24 @@ -227,6 +227,7 @@
    1.25  	// Pointer events
    1.26  	IMPORT_C void SetPointerCapture(TBool aCapture=ETrue);
    1.27  	IMPORT_C void ClaimPointerGrab(TBool aSendUpEvent=ETrue);
    1.28 +	IMPORT_C TInt ClaimPointerGrab(TInt aPointerNumber, TBool aSendUpEvent);
    1.29  	IMPORT_C void IgnoreEventsUntilNextPointerUp();
    1.30  	IMPORT_C void SetGloballyCapturing(TBool aGlobal);
    1.31  	// Pointer hit test
    1.32 @@ -303,6 +304,7 @@
    1.33  	IMPORT_C void HandleRedrawEvent(const TRect& aRect) const;
    1.34  	IMPORT_C void SetAllowStrayPointers();
    1.35  	IMPORT_C CCoeControl* GrabbingComponent() const;
    1.36 +	IMPORT_C CCoeControl* GrabbingComponent(TInt aPointer) const;
    1.37  	IMPORT_C TBool CapturesPointer() const;
    1.38  	// Drawing	
    1.39  	IMPORT_C TBool IsReadyToDraw() const;
    1.40 @@ -360,8 +362,8 @@
    1.41  	void DrawComponents(const TRect& aRect) const;	
    1.42  	void DrawWindowOwningComponentsNow() const;
    1.43  	void DrawWindowOwningComponentsNow(const TRect &aRect) const;	
    1.44 -	void SetGrabbed(TBool aGrabbed);
    1.45 -	TBool IsGrabbed() const;
    1.46 +	void SetGrabbed(TBool aGrabbed, TInt aPointerNumber);
    1.47 +	TBool IsGrabbed(TInt aPointerNumber = 0) const;
    1.48  	void DoMakeVisible(TBool aVisible);
    1.49  	void CheckPointerEventPurge() const;
    1.50  	void RecursivelyMergeTextDrawers(CCoeTextDrawerBase*& aTextDrawer, const CCoeControl* aDrawingControl, TInt aKey) const;
    1.51 @@ -376,6 +378,8 @@
    1.52  	void ActivateGcRecursive() const;
    1.53  	void DeactivateGcRecursive() const;
    1.54  	void ReportControlStateChange(MCoeControlStateObserver::TCoeState aType);
    1.55 +	TInt ValidateAdvancedPointerNumber( const TPointerEvent& aPointerEvent ) const;
    1.56 +	void ControlClaimPointerGrab(TInt aPointerNumber);
    1.57  public:	
    1.58  	IMPORT_C void EnableReportControlStateChange(TBool aState);
    1.59  
    1.60 @@ -387,7 +391,7 @@
    1.61  private:
    1.62  	TInt iFlags;
    1.63  	RDrawableWindow* iWin;
    1.64 -	RCoeDynamicDataStorage* iData;
    1.65 +	CCoeControlStorage* iData;
    1.66  	MObjectProvider* iMopParent;
    1.67  	};
    1.68