1.1 --- a/epoc32/include/mw/coemain.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/mw/coemain.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 @@ -24,6 +24,7 @@
1.16 #include <coemop.h>
1.17 #include <coetextdrawer.h>
1.18
1.19 +
1.20 #if defined(USE_IH_RAISE_EVENT)
1.21 #include <systemmonitor/raiseevent.h>
1.22 #include <test/testinstrumentation.h>
1.23 @@ -41,6 +42,9 @@
1.24 class CCoeEnvExtra;
1.25 class CCoeStatic;
1.26
1.27 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.28 +#include <graphics/cone/coescheduler.h>
1.29 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.30
1.31 /** UI Control framework active object priorities.
1.32 These are in addition to the values contained in the TPriority enum in class CActive.
1.33 @@ -264,34 +268,6 @@
1.34 };
1.35
1.36
1.37 -/** Implements the active scheduler presupposed by the control environment.
1.38 -
1.39 -@publishedPartner
1.40 -@deprecated
1.41 -*/
1.42 -class CCoeScheduler : public CBaActiveScheduler
1.43 - {
1.44 -public:
1.45 - IMPORT_C CCoeScheduler(CCoeEnv* aCoeEnv);
1.46 - IMPORT_C virtual void WaitForAnyRequest();
1.47 - IMPORT_C virtual void DisplayError(TInt aError) const;
1.48 - /** Gets the control environment.
1.49 -
1.50 - @return A pointer to the control environment. */
1.51 - inline CCoeEnv* CoeEnv() {return iCoeEnv;}
1.52 - TBool Flush() const; // not to be called from outside CONE
1.53 - void SetFlush(TBool aFlush); // not to be called from outside CONE
1.54 -private:
1.55 - // from CBaActiveScheduler
1.56 - IMPORT_C virtual void Reserved_1();
1.57 - IMPORT_C virtual void Reserved_2();
1.58 -private:
1.59 - CCoeEnv* iCoeEnv;
1.60 - TBool iFlush;
1.61 - };
1.62 -
1.63 -
1.64 -
1.65 /** Control environment.
1.66
1.67 CCoeEnv provides an active environment for creating controls. It implements
1.68 @@ -346,7 +322,7 @@
1.69 IMPORT_C void SuppressNextFlush();
1.70 IMPORT_C TBool IsWservEventPending() const;
1.71 IMPORT_C TBool IsRedrawEventPending() const;
1.72 - // Fonts (legacy API)
1.73 + // Fonts
1.74 IMPORT_C CFbsFont* CreateDeviceFontL(CGraphicsDevice* aDevice,const TFontSpec& aFontSpec);
1.75 IMPORT_C CFbsFont* CreateScreenFontL(const TFontSpec& aFontSpec);
1.76 IMPORT_C void ReleaseScreenFont(CFont* aFont) const;
1.77 @@ -422,11 +398,9 @@
1.78 // Singleton access
1.79 IMPORT_C static CCoeStatic* Static(TUid aUid);
1.80 IMPORT_C CCoeStatic* FindStatic(TUid aUid);
1.81 -#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
1.82 //multiple screens
1.83 IMPORT_C CWsScreenDevice* ScreenDevice(TInt aScreenNumber) const;
1.84 IMPORT_C RWindowGroup* RootWin(TInt aScreenNumber) const;
1.85 -#endif
1.86 public: // *** Do not use! API liable to change ***
1.87 TInt AppStartupInstrumentationEventIdBase();
1.88 public: // Internal to Symbian
1.89 @@ -449,7 +423,7 @@
1.90 inline TDes& ErrorText();
1.91 inline TDes& ErrorContextText();
1.92 public: // but not exported
1.93 - void ReadEvent();
1.94 + void DoFlush();
1.95 CVwsSessionWrapper* InitViewServerSessionL(MVwsSessionWrapperObserver& aObserver);
1.96 void AddStatic(CCoeStatic* aStatic);
1.97 void QueueNotificationToFocusObserversOfChangeInFocus();
1.98 @@ -457,7 +431,9 @@
1.99 TBool FocusObserverNotificationIsStillPending(TInt aFocusObserverNotificationIdentifier) const;
1.100 void RefetchPixelMappingL();
1.101 TBool ControlStateChange();
1.102 + TInt SupportedPointers() const;
1.103 private:
1.104 + void RequestEventNotification();
1.105 void CreateActiveSchedulerL();
1.106 void ConnectToFileServerL();
1.107 void ConnectToWindowServerL();
1.108 @@ -474,10 +450,8 @@
1.109 void SetInitialHandleCount();
1.110 TUint InitialHandleCount() const;
1.111 RResourceFile* DoResourceFileForIdL(TInt aResourceId) const;
1.112 -#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
1.113 void PopulateArrayOfScreenItemsL();
1.114 void DeleteArrayOfScreensItems();
1.115 -#endif
1.116 protected:
1.117 CCoeAppUi* iAppUi;
1.118 RFs iFsSession;