--- a/epoc32/include/mw/coemain.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/coemain.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1997-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.
@@ -24,6 +24,7 @@
 #include <coemop.h>
 #include <coetextdrawer.h>
 
+
 #if defined(USE_IH_RAISE_EVENT)
 #include <systemmonitor/raiseevent.h>
 #include <test/testinstrumentation.h>
@@ -41,6 +42,9 @@
 class CCoeEnvExtra;
 class CCoeStatic;
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <graphics/cone/coescheduler.h>
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 /** UI Control framework active object priorities. 
 These are in addition to the values contained in the TPriority enum in class CActive.
@@ -264,34 +268,6 @@
 	};
 
 
-/** Implements the active scheduler presupposed by the control environment.
-
-@publishedPartner
-@deprecated
-*/
-class CCoeScheduler : public CBaActiveScheduler
-	{
-public:
-	IMPORT_C CCoeScheduler(CCoeEnv* aCoeEnv);
-	IMPORT_C virtual void WaitForAnyRequest();
-	IMPORT_C virtual void DisplayError(TInt aError) const;
-	/** Gets the control environment.
-	
-	@return A pointer to the control environment. */
-	inline CCoeEnv* CoeEnv() {return iCoeEnv;}
-	TBool Flush() const; // not to be called from outside CONE
-	void SetFlush(TBool aFlush); // not to be called from outside CONE
-private:
-	// from CBaActiveScheduler
-	IMPORT_C virtual void Reserved_1();
-	IMPORT_C virtual void Reserved_2();
-private:
-	CCoeEnv* iCoeEnv;
-	TBool iFlush;
-	};
-
-
-
 /** Control environment.
 
 CCoeEnv provides an active environment for creating controls. It implements 
@@ -346,7 +322,7 @@
 	IMPORT_C void SuppressNextFlush();
 	IMPORT_C TBool IsWservEventPending() const;
 	IMPORT_C TBool IsRedrawEventPending() const;
-	// Fonts (legacy API)
+	// Fonts
 	IMPORT_C CFbsFont* CreateDeviceFontL(CGraphicsDevice* aDevice,const TFontSpec& aFontSpec);
 	IMPORT_C CFbsFont* CreateScreenFontL(const TFontSpec& aFontSpec);
 	IMPORT_C void ReleaseScreenFont(CFont* aFont) const;
@@ -422,11 +398,9 @@
 	// Singleton access
 	IMPORT_C static CCoeStatic* Static(TUid aUid);
 	IMPORT_C CCoeStatic* FindStatic(TUid aUid);
-#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
 	//multiple screens
  	IMPORT_C CWsScreenDevice* ScreenDevice(TInt aScreenNumber) const;
  	IMPORT_C RWindowGroup* RootWin(TInt aScreenNumber) const;
-#endif 	
 public: // *** Do not use! API liable to change ***
 	TInt AppStartupInstrumentationEventIdBase();
 public: // Internal to Symbian
@@ -449,7 +423,7 @@
 	inline TDes& ErrorText();
 	inline TDes& ErrorContextText();
 public: // but not exported
-	void ReadEvent();
+	void DoFlush();
 	CVwsSessionWrapper* InitViewServerSessionL(MVwsSessionWrapperObserver& aObserver);
 	void AddStatic(CCoeStatic* aStatic);
 	void QueueNotificationToFocusObserversOfChangeInFocus();
@@ -457,7 +431,9 @@
 	TBool FocusObserverNotificationIsStillPending(TInt aFocusObserverNotificationIdentifier) const;
 	void RefetchPixelMappingL();
 	TBool ControlStateChange();
+	TInt SupportedPointers() const;
 private:
+	void RequestEventNotification();
 	void CreateActiveSchedulerL();
 	void ConnectToFileServerL();
 	void ConnectToWindowServerL();
@@ -474,10 +450,8 @@
 	void SetInitialHandleCount();
 	TUint InitialHandleCount() const;
 	RResourceFile* DoResourceFileForIdL(TInt aResourceId) const;
-#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
 	void PopulateArrayOfScreenItemsL();
 	void DeleteArrayOfScreensItems();
-#endif	
 protected:
 	CCoeAppUi* iAppUi;
 	RFs iFsSession;