--- a/textinput/peninputfingerhwrar/src/peninputfingerhwrarwnd.cpp	Wed Sep 15 12:34:44 2010 +0300
+++ b/textinput/peninputfingerhwrar/src/peninputfingerhwrarwnd.cpp	Wed Oct 13 14:55:58 2010 +0300
@@ -24,7 +24,7 @@
 #include <AknLayoutDef.h>
 #include <AknUtils.h>
 #include <AknsUtils.h>
-#include <AknIconUtils.h>
+#include <akniconutils.h>
 #include <AknFepGlobalEnums.h>
 #include <aknfeppeninputenums.h>
 
@@ -87,7 +87,7 @@
 CPeninputFingerHwrArWnd::~CPeninputFingerHwrArWnd()
     {
     #ifdef RD_TACTILE_FEEDBACK
-    if(UiLayout() && iWritingBox)
+    if(UiLayout())
         {
 		UiLayout()->DeRegisterFeedbackArea(reinterpret_cast<TInt>(iWritingBox),
 	                                 iWritingBox->Rect());
@@ -352,10 +352,7 @@
     {
     if ( aInfo.Length() > 0 )
         {
-        TRect rect(iLafManager->IndicatorBubbleRect());
-        iContextField->MsgBubbleCtrl()->SetRect(rect);
-//        iContextField->ShowBubble( aInfo, iContextField->MsgBubbleCtrl()->Rect());
-        iContextField->ShowBubble( aInfo, rect);
+        iContextField->ShowBubble( aInfo, iContextField->MsgBubbleCtrl()->Rect() );
         }
     else
         {
@@ -622,7 +619,6 @@
                                           KAknsIIDQsnFrInputPreviewMiddle,
                                           KAknsIIDQsnFrInputPreviewSideR );  
     iContextField->SetMsgBubbleCtrlSize( TSize( bubbleLineLayout.iW,bubbleLineLayout.iH ) );    
-    iContextField->MsgBubbleCtrl()->SetTextL(KNullDesC);
     
     iContextField->SetLineSeparatorAfterPrompt(ETrue);
     
@@ -825,7 +821,7 @@
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArWnd::LoadNumSymbolVirtualKeysL( const TInt aResId, 
-    const RArray<TRect>& aCellRects, TBool aReload)
+    const RArray<TRect>& aCellRects )
     {
     TAknTextLineLayout txtlayout = iLafManager->NumpadKeyTxtLayout();
     iNumSymbolTable->KeyPad()->SetTextLineLayout( txtlayout );
@@ -833,14 +829,8 @@
     TInt fontid = txtlayout.FontId();
     const CFont* font = AknLayoutUtils::FontFromId( fontid );
     iNumSymbolTable->KeyPad()->SetFont( font );
-    if(aReload)
-        {
-        iNumSymbolTable->LoadVirtualKeypadKeyL(aResId,aCellRects);
-        }
-    else
-        {
-        iNumSymbolTable->UpdateAllVirtualKeysRect(aCellRects);
-        }
+    
+    iNumSymbolTable->LoadVirtualKeypadKeyL(aResId,aCellRects);
     }
 
 // ---------------------------------------------------------------------------
@@ -953,7 +943,7 @@
     iLafManager->GetNumVirtualKeyRects( numrects );
     
     // load keys
-    LoadNumSymbolVirtualKeysL(R_FINGER_HWR_NUMPAD, numrects,EFalse);
+    LoadNumSymbolVirtualKeysL(R_FINGER_HWR_NUMPAD, numrects);
         
     CleanupStack::PopAndDestroy();//rects
     
@@ -964,7 +954,9 @@
     rect = iLafManager->CtrlRect(iNumSymbolTable->ControlId());
     iNumSymbolTable->SetRect(rect);
     
-    iNumSymbolTable->SizeChanged(iLafManager->GetVirtualNumKeyRect());
+    iNumSymbolTable->SizeChanged(iLafManager->GetVirtualNumKeyRect(),
+                              iLafManager->GetSymBtnArray(), numpadrows, numpadcols,
+                              iLafManager->IsLandscape());
     }
 
 
@@ -1492,7 +1484,7 @@
 //
 void CPeninputFingerHwrArWnd::SetNumericMapping( const TDesC& aNumMapping )
     {
-    iNumSymbolTable->UpdateTableSymbol(aNumMapping);
+    iNumSymbolTable->SetNumericMapping(aNumMapping);
     }
 // ---------------------------------------------------------------------------
 //  set native number mode on or off.