diff -r 8592a65ad3fb -r b13141f05c3d emailuis/emailui/src/ncseditor.cpp --- a/emailuis/emailui/src/ncseditor.cpp Wed Apr 14 15:42:15 2010 +0300 +++ b/emailuis/emailui/src/ncseditor.cpp Tue Apr 27 16:20:14 2010 +0300 @@ -83,15 +83,8 @@ CNcsEditor::~CNcsEditor() { FUNC_LOG; - // Platform layout change - delete iBgContext; - // delete iGlobalCharFormat; - - if ( iEditorCustomDrawer ) - { - delete iEditorCustomDrawer; - } + delete iEditorCustomDrawer; delete iCaptionText; } @@ -196,17 +189,6 @@ } // ----------------------------------------------------------------------------- -// CNcsEditor::SetRect -// ----------------------------------------------------------------------------- -// -void CNcsEditor::SetRect( const TRect& aRect ) - { - FUNC_LOG; - //CCoeControl::SetRect( aRect ); - CEikRichTextEditor::SetRect( aRect ); - } - -// ----------------------------------------------------------------------------- // CNcsEditor::HandleResourceChange // ----------------------------------------------------------------------------- // @@ -217,8 +199,6 @@ if ( aType == KAknsMessageSkinChange ) { - // S60 skin support - UpdateGraphics(); UpdateFontSize(); UpdateColors(); if ( iCustomDrawer ) @@ -292,10 +272,7 @@ SetCursorPosL(0,EFalse); UpdateFontSize(); UpdateColors(); - // S60 skin support - UpdateGraphics(); - // - } + } // ----------------------------------------------------------------------------- // CNcsEditor::LineCount() const @@ -496,41 +473,6 @@ GlobalText()->SetGlobalCharFormat( iGlobalCharFormat ); } -// - -// ----------------------------------------------------------------------------- -// CNcsEditor::UpdateGraphics -// ----------------------------------------------------------------------------- -// -void CNcsEditor::UpdateGraphics() - { - TRAP_IGNORE( DoUpdateGraphicsL() ); - } - -// ----------------------------------------------------------------------------- -// CNcsEditor::DoUpdateGraphicsL -// ----------------------------------------------------------------------------- -// -void CNcsEditor::DoUpdateGraphicsL() - { - // S60 Skin support - delete iBgContext; - iBgContext = NULL; - - TSize mainPaneSize; - AknLayoutUtils::LayoutMetricsSize( - AknLayoutUtils::EMainPane, mainPaneSize ); - - iBgContext = CAknsBasicBackgroundControlContext::NewL( - //KAknsIIDQgnFsGrafEmailContent, - KAknsIIDQsnBgAreaMain, - TRect( mainPaneSize ), - EFalse ); - - SetSkinBackgroundControlContextL( iBgContext ); - // - } - // --------------------------------------------------------------------------- // CNcsEditor::GetLabelText // ---------------------------------------------------------------------------