--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swttable.cpp	Thu Jul 15 18:31:06 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swttable.cpp	Thu Aug 19 09:48:13 2010 +0300
@@ -1904,9 +1904,12 @@
 //
 TInt CSwtTable::FocusBackgroundPolicy() const
 {
+#ifdef RD_JAVA_S60_RELEASE_9_2
+    return ENoFocusBackgroundInCaptionedControl;
+#else
     return ASwtControlBase::FocusBackgroundPolicy();
-};
-
+#endif // RD_JAVA_S60_RELEASE_9_2
+}
 // ---------------------------------------------------------------------------
 // From MSwtControl
 // ---------------------------------------------------------------------------
@@ -2197,6 +2200,27 @@
 }
 #endif //RD_JAVA_S60_RELEASE_9_2
 
+// ---------------------------------------------------------------------------
+// CSwtTable::PrepareForTraverse
+// From MSwtControl
+// ---------------------------------------------------------------------------
+//
+void CSwtTable::PrepareForTraverse()
+{
+    ASSERT(iTableListBox);
+    ASSERT(iTableListBox->View());
+
+#ifdef RD_JAVA_S60_RELEASE_9_2
+    // AvKon enables highlight only when key event is recieved.
+    // When traversing, no key event is sent to AvKon, so we
+    // have to enable highlight by ourselves.
+    CListItemDrawer* itemDrawer = iTableListBox->View()->ItemDrawer();
+    if (itemDrawer)
+    {
+        itemDrawer->ClearFlags(CListItemDrawer::ESingleClickDisabledHighlight);
+    }
+#endif //RD_JAVA_S60_RELEASE_9_2
+}
 
 // ---------------------------------------------------------------------------
 // From ASwtScrollableBase