--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcontrolbase.cpp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcontrolbase.cpp	Wed Oct 13 14:23:59 2010 +0300
@@ -530,11 +530,6 @@
     // Do nothing here. Inherit where needed.
 }
 
-EXPORT_C void ASwtControlBase::PrepareForTraverse()
-{
-    // Do nothing here. Inherit where needed.
-}
-
 TRect ASwtControlBase::ClipToVisibleRect(const TRect& aRect) const
 {
     // WINDOW COORDINATES!
@@ -804,18 +799,6 @@
                 return EKeyWasConsumed;
             }
         }
-#ifdef RD_JAVA_S60_RELEASE_9_2
-        // On 9.2 MSK is never shown, so we have to always handle
-        // the Selection key
-        else if (aKeyEvent.iCode == EKeyOK && !IsKeyUsed(EKeyOK)
-                 && commandArranger->IsContextSensitiveOperationSet())
-        {
-            if (commandArranger->DoContextSensitiveOperationL())
-            {
-                return EKeyWasConsumed;
-            }
-        }
-#else
         else if (!AknLayoutUtils::MSKEnabled() ||
                  (activeTopShell && activeTopShell->FullScreenMode()))
         {
@@ -831,7 +814,6 @@
                 }
             }
         }
-#endif //RD_JAVA_S60_RELEASE_9_2
         else if (aKeyEvent.iCode == EKeyEnter && !IsKeyUsed(EKeyEnter))
         {
             if (commandArranger->HandleEnterKeyL())