diff -r b1ea1642412e -r ac7e4d1d9209 textinput/peninputfingerhwrar/src/peninputfingerhwrarlayout.cpp --- a/textinput/peninputfingerhwrar/src/peninputfingerhwrarlayout.cpp Thu Jul 15 19:01:13 2010 +0300 +++ b/textinput/peninputfingerhwrar/src/peninputfingerhwrarlayout.cpp Thu Aug 19 10:15:25 2010 +0300 @@ -49,46 +49,6 @@ const TInt16 KEmotionKeyMark = 0xFFFE; -class CPeninputFingerHwrArCallBack : public CActive - { - friend class CPeninputFingerHwrArLayout; -public: - void IssueRequestL(); -private: - CPeninputFingerHwrArCallBack(CPeninputFingerHwrArLayout* aHwrArLayout); - void RunL(); - void DoCancel(); -private: - CPeninputFingerHwrArLayout* iHwrArLayout; - }; - -CPeninputFingerHwrArCallBack::CPeninputFingerHwrArCallBack(CPeninputFingerHwrArLayout* aHwrArLayout) - :CActive(EPriorityHigh) - { - CActiveScheduler::Add(this); - iHwrArLayout = aHwrArLayout; - } -void CPeninputFingerHwrArCallBack::IssueRequestL() - { - if(!IsActive()) - { - iStatus=KRequestPending; - SetActive(); - TRequestStatus *pS=(&iStatus); - - User::RequestComplete(pS,0); - } - } -void CPeninputFingerHwrArCallBack::RunL() - { - iHwrArLayout->CallBackL(); - } - -void CPeninputFingerHwrArCallBack::DoCancel() - { - - } - // ============================ MEMBER FUNCTIONS ============================= // --------------------------------------------------------------------------- @@ -141,9 +101,7 @@ //retrieve the settings LoadAndPublishDefaultL(); - - //iCallBack = new (ELeave) CPeninputFingerHwrArCallBack(this); - + //set screen layout extent SetRect( TRect( TPoint( 0, 0 ), ScreenSize() ) ); } @@ -627,17 +585,7 @@ iRepositorySetting->Get( KSettingsPenInputLang, newValue ); iDataStore->SetLanguageL( newValue ); - -// TInt displayLang = 0; -// iCommonEngineRepository->Get(KGSDisplayTxtLang,displayLang); -// if(displayLang == ELangArabic) -// { -// iHwrWnd->SetNativeNumMode(ETrue); -// } -// else -// { -// iHwrWnd->SetNativeNumMode(EFalse); -// } + iHwrWnd->SetNativeNumMode(iDataStore->IsNativeNumMode()); } @@ -674,8 +622,6 @@ delete iStateMgr; delete iGSRepositoryWatcher; delete iRepositorySetting; -// delete iCommonEngineRepository; - //delete iCallBack; } // --------------------------------------------------------------------------- @@ -932,7 +878,6 @@ // void CPeninputFingerHwrArLayout::OnHwrStrokeStartedL() { - //iCallBack->IssueRequestL(); iHwrWnd->HideIndicator(); // The default candidate cell is not highlight