javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcontrolbase.cpp
branchRCL_3
changeset 77 7cee158cb8cd
parent 66 2455ef1f5bbc
child 83 26b2b12093af
--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcontrolbase.cpp	Tue Sep 14 21:06:50 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcontrolbase.cpp	Wed Sep 15 12:05:25 2010 +0300
@@ -804,6 +804,18 @@
                 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()))
         {
@@ -819,6 +831,7 @@
                 }
             }
         }
+#endif //RD_JAVA_S60_RELEASE_9_2
         else if (aKeyEvent.iCode == EKeyEnter && !IsKeyUsed(EKeyEnter))
         {
             if (commandArranger->HandleEnterKeyL())