diff -r 71dd06cfe933 -r 0aa5fbdfbc30 uifw/AvKon/src/AknSctDialog.cpp --- a/uifw/AvKon/src/AknSctDialog.cpp Wed Apr 14 16:14:00 2010 +0300 +++ b/uifw/AvKon/src/AknSctDialog.cpp Tue Apr 27 16:55:05 2010 +0300 @@ -595,7 +595,7 @@ case EKeyDownArrow: { TKeyResponse res = charmapControl->OfferKeyEventL(aKeyEvent, aModifiers); - RefreshTitleAndNavi(); + RefreshTitleAndNaviL(); return res; } @@ -956,23 +956,16 @@ // EXPORT_C void CAknCharMapDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent) { - if (!Rect().Contains( aPointerEvent.iPosition)) + if(!Rect().Contains(aPointerEvent.iPosition)) { if(aPointerEvent.iType == TPointerEvent::EButton1Down) { - TryExitL (EAknSoftkeyCancel); + TryExitL(EAknSoftkeyCancel); return; } - else if(aPointerEvent.iType == TPointerEvent::EButton1Up) - { - CAknCharMap* charMap = STATIC_CAST( CAknCharMap*, Control( EAknSCTQueryContentId ) ); - charMap->HandlePointerEventL( aPointerEvent); - } } - else - { - CAknDialog::HandlePointerEventL(aPointerEvent); - } + + CAknDialog::HandlePointerEventL(aPointerEvent); } void CAknCharMapDialog::SwitchTablesOrPagesL() @@ -1007,10 +1000,10 @@ CAknPopupHeadingPane* headingPane = STATIC_CAST(CAknPopupHeadingPane*, Control(EAknSCTQueryHeadingId)); charmapControl->NextPageL(); - RefreshTitleAndNavi(); + RefreshTitleAndNaviL(); } -void CAknCharMapDialog::RefreshTitleAndNavi() +void CAknCharMapDialog::RefreshTitleAndNaviL() { CAknCharMap* charmapControl = STATIC_CAST(CAknCharMap*, Control(EAknSCTQueryContentId)); CAknPopupHeadingPane* headingPane = STATIC_CAST(CAknPopupHeadingPane*, Control(EAknSCTQueryHeadingId));