1.1 --- a/epoc32/include/mw/coeview.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/coeview.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 @@ -20,6 +20,7 @@
    1.16  #include <coemain.h> // for CCoeStatic
    1.17  
    1.18  class CCoeAppUi;
    1.19 +class TVwsViewEvent;
    1.20  
    1.21  /** Specifies an interface for views. 
    1.22  
    1.23 @@ -73,34 +74,26 @@
    1.24  	TInt iMCoeView_Reserved1;
    1.25  	};
    1.26  
    1.27 -/** An interface through which view deactivations can be
    1.28 -notified to an observer.
    1.29 -
    1.30 -Dialogs and other floating windows such as virtual keyboards which should be dismissed
    1.31 -when a view is deactivated can implement this interface and take any action required.
    1.32 +/** An interface through which view events can be notified to an observer.
    1.33  
    1.34  @publishedAll
    1.35  @released */
    1.36 -class MCoeViewDeactivationObserver
    1.37 +class MCoeViewObserver
    1.38  	{
    1.39  public:
    1.40 -	//
    1.41 -	// Handles the deactivation of the view identified by aViewIdToBeDeactivated before the newly activated
    1.42 -	// view with id aNewlyActivatedViewId is marked as current.
    1.43 -	//
    1.44 -	virtual void HandleViewDeactivation(const TVwsViewId& aViewIdToBeDeactivated,const TVwsViewId& aNewlyActivatedViewId)=0;
    1.45 +	virtual void HandleViewEventL(const TVwsViewEvent& aEvent)=0;
    1.46  protected:
    1.47 -	IMPORT_C MCoeViewDeactivationObserver();
    1.48 +	IMPORT_C MCoeViewObserver();
    1.49  private:
    1.50 -	IMPORT_C virtual void MCoeViewDeactivationObserver_Reserved_1();
    1.51 -	IMPORT_C virtual void MCoeViewDeactivationObserver_Reserved_2();
    1.52 +	IMPORT_C virtual void MCoeViewObserver_Reserved1();
    1.53 +	IMPORT_C virtual void MCoeViewObserver_Reserved2();
    1.54  private:
    1.55 -	TInt iMCoeViewDeactivationObserver_Reserved1;
    1.56 +	TInt iMCoeViewObserver_Reserved1;
    1.57  	};
    1.58  
    1.59  /** An interface through which view activations can be notified to an observer.
    1.60  
    1.61 -@publishedPartner
    1.62 +@publishedAll
    1.63  @released
    1.64  */
    1.65  class MCoeViewActivationObserver
    1.66 @@ -120,25 +113,32 @@
    1.67  	TInt iMCoeViewActivationObserver_Reserved1;
    1.68  	};
    1.69  
    1.70 +/** An interface through which view deactivations can be
    1.71 +notified to an observer.
    1.72  
    1.73 -/** An interface through which view events can be notified to an observer.
    1.74 +Dialogs and other floating windows such as virtual keyboards which should be dismissed
    1.75 +when a view is deactivated can implement this interface and take any action required.
    1.76  
    1.77 -@publishedPartner
    1.78 +@publishedAll
    1.79  @released */
    1.80 -class MCoeViewObserver
    1.81 +
    1.82 +class MCoeViewDeactivationObserver
    1.83  	{
    1.84  public:
    1.85 -	virtual void HandleViewEventL(const TVwsViewEvent& aEvent)=0;
    1.86 +	//
    1.87 +	// Handles the deactivation of the view identified by aViewIdToBeDeactivated before the newly activated
    1.88 +	// view with id aNewlyActivatedViewId is marked as current.
    1.89 +	//
    1.90 +	virtual void HandleViewDeactivation(const TVwsViewId& aViewIdToBeDeactivated,const TVwsViewId& aNewlyActivatedViewId)=0;
    1.91  protected:
    1.92 -	IMPORT_C MCoeViewObserver();
    1.93 +	IMPORT_C MCoeViewDeactivationObserver();
    1.94  private:
    1.95 -	IMPORT_C virtual void MCoeViewObserver_Reserved1();
    1.96 -	IMPORT_C virtual void MCoeViewObserver_Reserved2();
    1.97 +	IMPORT_C virtual void MCoeViewDeactivationObserver_Reserved_1();
    1.98 +	IMPORT_C virtual void MCoeViewDeactivationObserver_Reserved_2();
    1.99  private:
   1.100 -	TInt iMCoeViewObserver_Reserved1;
   1.101 +	TInt iMCoeViewDeactivationObserver_Reserved1;
   1.102  	};
   1.103  
   1.104 -
   1.105  //
   1.106  // Handles any screen device changes that occur while a view is active 
   1.107  //