From: Joogab Yun <joogab.yun@samsung.com>
Date: Tue, 1 Sep 2020 08:44:37 +0000 (+0900)
Subject: Revert "Renamed KeyEvent enum values to comply with coding standards."
X-Git-Tag: accepted/tizen/unified/20200903.151818~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7453fcec8f56f9755e405415e18d918689fcbffe;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Revert "Renamed KeyEvent enum values to comply with coding standards."

This reverts commit e3080a83ec85e14ec8cbf82831fd73b152c6e86a.
---

diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp
index f264ced..2ffdaaa 100644
--- a/builder/dali-builder.cpp
+++ b/builder/dali-builder.cpp
@@ -280,7 +280,7 @@ private:
   // Process Key events to Quit on back-key
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
index e4efeac..8360197 100644
--- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
+++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
@@ -131,7 +131,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/animated-gradient-call-active/animated-gradient-call-active.cpp b/examples/animated-gradient-call-active/animated-gradient-call-active.cpp
index 8b1d8ea..ab8842a 100644
--- a/examples/animated-gradient-call-active/animated-gradient-call-active.cpp
+++ b/examples/animated-gradient-call-active/animated-gradient-call-active.cpp
@@ -163,7 +163,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
index 696f1a9..f5e5b40 100644
--- a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
+++ b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
@@ -425,7 +425,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/animated-images/animated-images-example.cpp b/examples/animated-images/animated-images-example.cpp
index 1b96ac1..3f0c0b8 100644
--- a/examples/animated-images/animated-images-example.cpp
+++ b/examples/animated-images/animated-images-example.cpp
@@ -291,7 +291,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index b4633cd..d074ad3 100644
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -445,7 +445,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
+    if( event.GetState() == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
     {
       mApplication.Quit();
     }
diff --git a/examples/animated-vector-images/animated-vector-images-example.cpp b/examples/animated-vector-images/animated-vector-images-example.cpp
index b7bbd1d..b44a162 100644
--- a/examples/animated-vector-images/animated-vector-images-example.cpp
+++ b/examples/animated-vector-images/animated-vector-images-example.cpp
@@ -201,7 +201,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/arc-visual/arc-visual-example.cpp b/examples/arc-visual/arc-visual-example.cpp
index 708f7d5..0e98dc0 100644
--- a/examples/arc-visual/arc-visual-example.cpp
+++ b/examples/arc-visual/arc-visual-example.cpp
@@ -229,7 +229,7 @@ private:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::UP )
+    if( event.GetState() == KeyEvent::Up )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index 2b7520b..a2b10c8 100644
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -444,7 +444,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp
index d92bab9..2772111 100644
--- a/examples/bezier-curve/bezier-curve-example.cpp
+++ b/examples/bezier-curve/bezier-curve-example.cpp
@@ -573,7 +573,7 @@ public:
   void OnKeyEvent(const KeyEvent& event)
   {
 
-    if( event.GetState() == KeyEvent::DOWN && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
+    if( event.GetState() == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
     {
       mApplication.Quit();
     }
diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index 9d48518..828a85a 100644
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -826,7 +826,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/bloom-view/bloom-view-example.cpp b/examples/bloom-view/bloom-view-example.cpp
index 870c62c..64ceb02 100644
--- a/examples/bloom-view/bloom-view-example.cpp
+++ b/examples/bloom-view/bloom-view-example.cpp
@@ -130,7 +130,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp
index 1c9590d..0ae5145 100644
--- a/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@ -270,7 +270,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index b5d5f3b..42aef41 100644
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -532,7 +532,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 79649b5..97217f3 100644
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -359,7 +359,7 @@ class ButtonsController: public ConnectionTracker
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/clipping-draw-order/clipping-draw-order.cpp b/examples/clipping-draw-order/clipping-draw-order.cpp
index ac20cc1..a23b9d4 100644
--- a/examples/clipping-draw-order/clipping-draw-order.cpp
+++ b/examples/clipping-draw-order/clipping-draw-order.cpp
@@ -216,7 +216,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/clipping/clipping-example.cpp b/examples/clipping/clipping-example.cpp
index 7157db9..2dda716 100644
--- a/examples/clipping/clipping-example.cpp
+++ b/examples/clipping/clipping-example.cpp
@@ -172,7 +172,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/color-visual/color-visual-example.cpp b/examples/color-visual/color-visual-example.cpp
index 3ab4880..fee90fd 100644
--- a/examples/color-visual/color-visual-example.cpp
+++ b/examples/color-visual/color-visual-example.cpp
@@ -117,7 +117,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
index 2eb2b6b..a0c6079 100644
--- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
+++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
@@ -190,7 +190,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/contact-cards/contact-card.cpp b/examples/contact-cards/contact-card.cpp
index 4959d80..9d67eab 100644
--- a/examples/contact-cards/contact-card.cpp
+++ b/examples/contact-cards/contact-card.cpp
@@ -327,7 +327,7 @@ void ContactCard::OnAnimationFinished( Animation& animation )
 void ContactCard::OnKeyEvent( const KeyEvent& event )
 {
   if( ( ! mFolded ) && // If we're folded then there's no need to do any more checking
-      ( event.GetState() == KeyEvent::DOWN ) )
+      ( event.GetState() == KeyEvent::Down ) )
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
     {
diff --git a/examples/contact-cards/contact-cards-example.cpp b/examples/contact-cards/contact-cards-example.cpp
index 343edbe..087c53a 100644
--- a/examples/contact-cards/contact-cards-example.cpp
+++ b/examples/contact-cards/contact-cards-example.cpp
@@ -98,7 +98,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       KeyInputFocusManager keyInputFocusManager = KeyInputFocusManager::Get();
       if( ! keyInputFocusManager.GetCurrentFocusControl() ) // Don't quit if a control has focus
diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp
index 7f01c51..bd65bb8 100644
--- a/examples/cube-transition-effect/cube-transition-effect-example.cpp
+++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp
@@ -403,7 +403,7 @@ Texture CubeTransitionApp::LoadWindowFillingTexture( const char* filepath )
 
 void CubeTransitionApp::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.GetState() == KeyEvent::DOWN)
+  if(event.GetState() == KeyEvent::Down)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/deferred-shading/deferred-shading.cpp b/examples/deferred-shading/deferred-shading.cpp
index 7a1920f..b3c9131 100644
--- a/examples/deferred-shading/deferred-shading.cpp
+++ b/examples/deferred-shading/deferred-shading.cpp
@@ -777,7 +777,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp
index 9b9fd90..870cfda 100644
--- a/examples/dissolve-effect/dissolve-effect-example.cpp
+++ b/examples/dissolve-effect/dissolve-effect-example.cpp
@@ -327,7 +327,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
 
 void DissolveEffectApp::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.GetState() == KeyEvent::DOWN)
+  if(event.GetState() == KeyEvent::Down)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/drag-and-drop/drag-and-drop-example.cpp b/examples/drag-and-drop/drag-and-drop-example.cpp
index 22e733f..2444913 100644
--- a/examples/drag-and-drop/drag-and-drop-example.cpp
+++ b/examples/drag-and-drop/drag-and-drop-example.cpp
@@ -118,7 +118,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/effects-view/effects-view-example.cpp b/examples/effects-view/effects-view-example.cpp
index c75953a..dab07ea 100644
--- a/examples/effects-view/effects-view-example.cpp
+++ b/examples/effects-view/effects-view-example.cpp
@@ -234,7 +234,7 @@ bool EffectsViewApp::ChangeEffectSize( Button button )
 
 void EffectsViewApp::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.GetState() == KeyEvent::DOWN)
+  if(event.GetState() == KeyEvent::Down)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/flex-container/flex-container-example.cpp b/examples/flex-container/flex-container-example.cpp
index 6eff529..843227c 100644
--- a/examples/flex-container/flex-container-example.cpp
+++ b/examples/flex-container/flex-container-example.cpp
@@ -330,7 +330,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/focus-integration/focus-integration.cpp b/examples/focus-integration/focus-integration.cpp
index 6f9dad5..82bd570 100644
--- a/examples/focus-integration/focus-integration.cpp
+++ b/examples/focus-integration/focus-integration.cpp
@@ -175,7 +175,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/fpp-game/fpp-game-example.cpp b/examples/fpp-game/fpp-game-example.cpp
index 989a3fa..03cf099 100644
--- a/examples/fpp-game/fpp-game-example.cpp
+++ b/examples/fpp-game/fpp-game-example.cpp
@@ -114,7 +114,7 @@ public:
   // Handle a quit key event
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/frame-callback/frame-callback-example.cpp b/examples/frame-callback/frame-callback-example.cpp
index 6ec5cab..b19ac5de 100644
--- a/examples/frame-callback/frame-callback-example.cpp
+++ b/examples/frame-callback/frame-callback-example.cpp
@@ -165,7 +165,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
index bd1c807..fd3bf27 100644
--- a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
+++ b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
@@ -142,7 +142,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp
index e2d8e8a..247147b 100644
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
@@ -453,7 +453,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp
index 557ebdc..fb0250b 100644
--- a/examples/gradients/gradients-example.cpp
+++ b/examples/gradients/gradients-example.cpp
@@ -183,7 +183,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp
index ebf322e..8fc6997 100644
--- a/examples/hello-world/hello-world-example.cpp
+++ b/examples/hello-world/hello-world-example.cpp
@@ -63,7 +63,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index 56e601c..fbcf209 100644
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -446,7 +446,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/image-policies/image-policies-example.cpp b/examples/image-policies/image-policies-example.cpp
index 3014b3d..fd4b732 100644
--- a/examples/image-policies/image-policies-example.cpp
+++ b/examples/image-policies/image-policies-example.cpp
@@ -525,7 +525,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index d79a272..4365ef9 100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -566,7 +566,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
index 203b710..47aa49a 100644
--- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
+++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
@@ -542,7 +542,7 @@ public:
   */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE )
           || IsKey( event, Dali::DALI_KEY_BACK ) )
diff --git a/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
index e1c6a9e..96e8a34 100644
--- a/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
+++ b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
@@ -88,7 +88,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/image-view-pixel-area/image-view-pixel-area-example.cpp b/examples/image-view-pixel-area/image-view-pixel-area-example.cpp
index fdbe0a6..528c82d 100644
--- a/examples/image-view-pixel-area/image-view-pixel-area-example.cpp
+++ b/examples/image-view-pixel-area/image-view-pixel-area-example.cpp
@@ -213,7 +213,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp
index bfbe038..07a2ca9 100644
--- a/examples/image-view-svg/image-view-svg-example.cpp
+++ b/examples/image-view-svg/image-view-svg-example.cpp
@@ -209,7 +209,7 @@ public:
     */
    void OnKeyEvent(const KeyEvent& event)
    {
-     if(event.GetState() == KeyEvent::DOWN)
+     if(event.GetState() == KeyEvent::Down)
      {
        if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
        {
diff --git a/examples/image-view-url/image-view-url-example.cpp b/examples/image-view-url/image-view-url-example.cpp
index 86f639e..590a90e 100644
--- a/examples/image-view-url/image-view-url-example.cpp
+++ b/examples/image-view-url/image-view-url-example.cpp
@@ -186,7 +186,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp
index 2e19d64..ebad860 100644
--- a/examples/image-view/image-view-example.cpp
+++ b/examples/image-view/image-view-example.cpp
@@ -260,7 +260,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index e4aee2b..f7e3eba 100644
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -963,7 +963,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp
index 3d1d2db..d90ea95 100644
--- a/examples/line-mesh/line-mesh-example.cpp
+++ b/examples/line-mesh/line-mesh-example.cpp
@@ -310,7 +310,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index b44c963..ab87c6b 100644
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -376,7 +376,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp
index 3a50a0f..3b53a74 100644
--- a/examples/mesh-morph/mesh-morph-example.cpp
+++ b/examples/mesh-morph/mesh-morph-example.cpp
@@ -326,7 +326,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp
index 17b9c1d..a2bf17f 100644
--- a/examples/mesh-visual/mesh-visual-example.cpp
+++ b/examples/mesh-visual/mesh-visual-example.cpp
@@ -572,7 +572,7 @@ public:
   //If escape or the back button is pressed, quit the application (and return to the launcher)
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp
index 22b150f..6e48c1d 100644
--- a/examples/metaball-explosion/metaball-explosion-example.cpp
+++ b/examples/metaball-explosion/metaball-explosion-example.cpp
@@ -667,7 +667,7 @@ bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent& touch
 
 void MetaballExplosionController::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.GetState() == KeyEvent::DOWN)
+  if(event.GetState() == KeyEvent::Down)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp
index 96134b4..1d060d2 100644
--- a/examples/metaball-refrac/metaball-refrac-example.cpp
+++ b/examples/metaball-refrac/metaball-refrac-example.cpp
@@ -759,7 +759,7 @@ bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent& touch )
 
 void MetaballRefracController::OnKeyEvent(const KeyEvent& event)
 {
-  if( event.GetState() == KeyEvent::DOWN )
+  if( event.GetState() == KeyEvent::Down )
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/model3d-view/model3d-view-example.cpp b/examples/model3d-view/model3d-view-example.cpp
index 7021e55..c02d526 100644
--- a/examples/model3d-view/model3d-view-example.cpp
+++ b/examples/model3d-view/model3d-view-example.cpp
@@ -262,7 +262,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 5df3cc4..a07b41c 100644
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -400,7 +400,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index 1e46e0c..e4dc669 100644
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -372,7 +372,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/native-image-source/native-image-source-example.cpp b/examples/native-image-source/native-image-source-example.cpp
index 073a223..1c887a8 100644
--- a/examples/native-image-source/native-image-source-example.cpp
+++ b/examples/native-image-source/native-image-source-example.cpp
@@ -384,7 +384,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index 9e3a238..03391e0 100644
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -267,7 +267,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation )
  */
 void PageTurnExample::OnKeyEvent(const KeyEvent& event)
 {
-  if(event.GetState() == KeyEvent::DOWN)
+  if(event.GetState() == KeyEvent::Down)
   {
     if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp
index 8a7d2a0..5445363 100644
--- a/examples/perf-scroll/perf-scroll.cpp
+++ b/examples/perf-scroll/perf-scroll.cpp
@@ -438,7 +438,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/pivot/pivot-example.cpp b/examples/pivot/pivot-example.cpp
index 5cf21e7..231f3ed 100644
--- a/examples/pivot/pivot-example.cpp
+++ b/examples/pivot/pivot-example.cpp
@@ -136,7 +136,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp
index 38b4028..16ce8c0 100644
--- a/examples/point-mesh/point-mesh-example.cpp
+++ b/examples/point-mesh/point-mesh-example.cpp
@@ -203,7 +203,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/popup/popup-example.cpp b/examples/popup/popup-example.cpp
index 15475b5..b85b74b 100644
--- a/examples/popup/popup-example.cpp
+++ b/examples/popup/popup-example.cpp
@@ -671,7 +671,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/pre-render-callback/pre-render-callback-example.cpp b/examples/pre-render-callback/pre-render-callback-example.cpp
index 57b3bdb..faeef29 100644
--- a/examples/pre-render-callback/pre-render-callback-example.cpp
+++ b/examples/pre-render-callback/pre-render-callback-example.cpp
@@ -187,7 +187,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp
index 54fffa1..b613980 100644
--- a/examples/primitive-shapes/primitive-shapes-example.cpp
+++ b/examples/primitive-shapes/primitive-shapes-example.cpp
@@ -676,7 +676,7 @@ public:
   //If escape or the back button is pressed, quit the application (and return to the launcher)
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/progress-bar/progress-bar-example.cpp b/examples/progress-bar/progress-bar-example.cpp
index 30864e5..60433e1 100644
--- a/examples/progress-bar/progress-bar-example.cpp
+++ b/examples/progress-bar/progress-bar-example.cpp
@@ -234,7 +234,7 @@ private:
   }
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/property-notification/property-notification-example.cpp b/examples/property-notification/property-notification-example.cpp
index 2bb9c7a..c54e239 100644
--- a/examples/property-notification/property-notification-example.cpp
+++ b/examples/property-notification/property-notification-example.cpp
@@ -88,7 +88,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp
index aeaf8b9..249ae85 100644
--- a/examples/ray-marching/ray-marching-example.cpp
+++ b/examples/ray-marching/ray-marching-example.cpp
@@ -149,7 +149,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/reflection-demo/reflection-example.cpp b/examples/reflection-demo/reflection-example.cpp
index 4dff874..ff2de1c 100644
--- a/examples/reflection-demo/reflection-example.cpp
+++ b/examples/reflection-demo/reflection-example.cpp
@@ -625,7 +625,7 @@ private:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
index 5c64bcc..9bdff4a 100644
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -561,7 +561,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp
index ae01d97..2e3f9bf 100644
--- a/examples/remote-image-loading/remote-image-loading-example.cpp
+++ b/examples/remote-image-loading/remote-image-loading-example.cpp
@@ -127,7 +127,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
@@ -138,7 +138,7 @@ public:
 
   void OnKey(const KeyEvent &event)
   {
-    if (event.GetState() == KeyEvent::DOWN)
+    if (event.GetState() == KeyEvent::Down)
     {
       std::cout<<"Window key : " << event.GetKeyCode() << std::endl;
     }
@@ -154,7 +154,7 @@ public:
 
   bool OnControlKeyEvent(Toolkit::Control control, const KeyEvent &event)
   {
-    if (event.GetState() == KeyEvent::DOWN)
+    if (event.GetState() == KeyEvent::Down)
     {
       std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
     }
diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp
index 00df548..72e73a5 100644
--- a/examples/renderer-stencil/renderer-stencil-example.cpp
+++ b/examples/renderer-stencil/renderer-stencil-example.cpp
@@ -731,7 +731,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-basic-light/rendering-basic-light-example.cpp b/examples/rendering-basic-light/rendering-basic-light-example.cpp
index 7408ca7..c96e37c 100644
--- a/examples/rendering-basic-light/rendering-basic-light-example.cpp
+++ b/examples/rendering-basic-light/rendering-basic-light-example.cpp
@@ -237,7 +237,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
index f09ff63..c2faf03 100644
--- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
+++ b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
@@ -252,7 +252,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-cube/rendering-cube.cpp b/examples/rendering-cube/rendering-cube.cpp
index 53e4d1a..a610545 100644
--- a/examples/rendering-cube/rendering-cube.cpp
+++ b/examples/rendering-cube/rendering-cube.cpp
@@ -120,7 +120,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-line/rendering-line.cpp b/examples/rendering-line/rendering-line.cpp
index 292d1a1..abb4544 100644
--- a/examples/rendering-line/rendering-line.cpp
+++ b/examples/rendering-line/rendering-line.cpp
@@ -113,7 +113,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-radial-progress/radial-progress.cpp b/examples/rendering-radial-progress/radial-progress.cpp
index a3dcbfd..d0120b2 100644
--- a/examples/rendering-radial-progress/radial-progress.cpp
+++ b/examples/rendering-radial-progress/radial-progress.cpp
@@ -294,7 +294,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-skybox/rendering-skybox.cpp b/examples/rendering-skybox/rendering-skybox.cpp
index 4e48b48..5368d3a 100644
--- a/examples/rendering-skybox/rendering-skybox.cpp
+++ b/examples/rendering-skybox/rendering-skybox.cpp
@@ -186,7 +186,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-textured-cube/rendering-textured-cube.cpp b/examples/rendering-textured-cube/rendering-textured-cube.cpp
index affa485..6230e0b 100644
--- a/examples/rendering-textured-cube/rendering-textured-cube.cpp
+++ b/examples/rendering-textured-cube/rendering-textured-cube.cpp
@@ -126,7 +126,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/rendering-triangle/rendering-triangle.cpp b/examples/rendering-triangle/rendering-triangle.cpp
index 882eaf4..ef3163d 100644
--- a/examples/rendering-triangle/rendering-triangle.cpp
+++ b/examples/rendering-triangle/rendering-triangle.cpp
@@ -113,7 +113,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp
index f326ae4..bee21c7 100644
--- a/examples/scroll-view/scroll-view-example.cpp
+++ b/examples/scroll-view/scroll-view-example.cpp
@@ -547,7 +547,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/shadows-and-lights/shadows-and-lights-example.cpp b/examples/shadows-and-lights/shadows-and-lights-example.cpp
index 2664df3..a4aec57 100644
--- a/examples/shadows-and-lights/shadows-and-lights-example.cpp
+++ b/examples/shadows-and-lights/shadows-and-lights-example.cpp
@@ -413,7 +413,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/simple-bitmap-font-text-label/simple-text-label-example.cpp b/examples/simple-bitmap-font-text-label/simple-text-label-example.cpp
index a7f6ff0..31e32c0 100644
--- a/examples/simple-bitmap-font-text-label/simple-text-label-example.cpp
+++ b/examples/simple-bitmap-font-text-label/simple-text-label-example.cpp
@@ -172,7 +172,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/simple-scroll-view/simple-scroll-view-example.cpp b/examples/simple-scroll-view/simple-scroll-view-example.cpp
index b69bd98..b821911 100644
--- a/examples/simple-scroll-view/simple-scroll-view-example.cpp
+++ b/examples/simple-scroll-view/simple-scroll-view-example.cpp
@@ -150,7 +150,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/simple-text-field/simple-text-field.cpp b/examples/simple-text-field/simple-text-field.cpp
index dd730e5..ef8be2c 100644
--- a/examples/simple-text-field/simple-text-field.cpp
+++ b/examples/simple-text-field/simple-text-field.cpp
@@ -74,7 +74,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/simple-text-label/simple-text-label-example.cpp b/examples/simple-text-label/simple-text-label-example.cpp
index 433edb2..8ef5bb4 100644
--- a/examples/simple-text-label/simple-text-label-example.cpp
+++ b/examples/simple-text-label/simple-text-label-example.cpp
@@ -71,7 +71,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/simple-text-renderer/simple-text-renderer-example.cpp b/examples/simple-text-renderer/simple-text-renderer-example.cpp
index 6f7dc21..b522a5b 100644
--- a/examples/simple-text-renderer/simple-text-renderer-example.cpp
+++ b/examples/simple-text-renderer/simple-text-renderer-example.cpp
@@ -327,7 +327,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/simple-text-visual/simple-text-visual-example.cpp b/examples/simple-text-visual/simple-text-visual-example.cpp
index f3dfdb0..89ba3e2 100644
--- a/examples/simple-text-visual/simple-text-visual-example.cpp
+++ b/examples/simple-text-visual/simple-text-visual-example.cpp
@@ -80,7 +80,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/simple-visuals-control/simple-visuals-application.cpp b/examples/simple-visuals-control/simple-visuals-application.cpp
index f20ffc7..30b1765 100644
--- a/examples/simple-visuals-control/simple-visuals-application.cpp
+++ b/examples/simple-visuals-control/simple-visuals-application.cpp
@@ -77,7 +77,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent& keyEvent )
 {
   static int keyPressed = 0;
 
-  if( keyEvent.GetState() == KeyEvent::DOWN)
+  if( keyEvent.GetState() == KeyEvent::Down)
   {
     if( keyPressed == 0 ) // Is this the first down event?
     {
@@ -93,7 +93,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent& keyEvent )
     }
     keyPressed = 1;
   }
-  else if( keyEvent.GetState() == KeyEvent::UP )
+  else if( keyEvent.GetState() == KeyEvent::Up )
   {
     keyPressed = 0;
   }
diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp
index 40066fa..8fff2d3 100644
--- a/examples/size-negotiation/size-negotiation-example.cpp
+++ b/examples/size-negotiation/size-negotiation-example.cpp
@@ -765,7 +765,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/sparkle/sparkle-effect-example.cpp b/examples/sparkle/sparkle-effect-example.cpp
index d3c0bc0..cdae958 100644
--- a/examples/sparkle/sparkle-effect-example.cpp
+++ b/examples/sparkle/sparkle-effect-example.cpp
@@ -248,7 +248,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp
index d50b731..220ca24 100644
--- a/examples/styling/styling-application.cpp
+++ b/examples/styling/styling-application.cpp
@@ -635,7 +635,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent& keyEvent )
 {
   static int keyPressed = 0;
 
-  if( keyEvent.GetState() == KeyEvent::DOWN)
+  if( keyEvent.GetState() == KeyEvent::Down)
   {
     if( keyPressed == 0 ) // Is this the first down event?
     {
@@ -676,7 +676,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent& keyEvent )
     }
     keyPressed = 1;
   }
-  else if( keyEvent.GetState() == KeyEvent::UP )
+  else if( keyEvent.GetState() == KeyEvent::Up )
   {
     keyPressed = 0;
   }
diff --git a/examples/super-blur-view/super-blur-view-example.cpp b/examples/super-blur-view/super-blur-view-example.cpp
index 6089199..17a1e41 100644
--- a/examples/super-blur-view/super-blur-view-example.cpp
+++ b/examples/super-blur-view/super-blur-view-example.cpp
@@ -91,7 +91,7 @@ private:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if ( event.GetState() == KeyEvent::DOWN )
+    if ( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/text-editor/text-editor-example.cpp b/examples/text-editor/text-editor-example.cpp
index 82c969b..d2d781f 100644
--- a/examples/text-editor/text-editor-example.cpp
+++ b/examples/text-editor/text-editor-example.cpp
@@ -220,7 +220,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index 001a342..4d2b251 100644
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -185,7 +185,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-fonts/text-fonts-example.cpp b/examples/text-fonts/text-fonts-example.cpp
index 211bd98..2f0a43d 100644
--- a/examples/text-fonts/text-fonts-example.cpp
+++ b/examples/text-fonts/text-fonts-example.cpp
@@ -206,7 +206,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp
index 9ec53d2..e2460c2 100644
--- a/examples/text-label-emojis/text-label-emojis.cpp
+++ b/examples/text-label-emojis/text-label-emojis.cpp
@@ -116,7 +116,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp
index 2ebb286..0edaf8b 100644
--- a/examples/text-label-multi-language/text-label-multi-language-example.cpp
+++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp
@@ -118,7 +118,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 7e904c1..0811209 100644
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -619,7 +619,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-memory-profiling/text-memory-profiling-example.cpp b/examples/text-memory-profiling/text-memory-profiling-example.cpp
index 8ab9ec1..a6768e3 100644
--- a/examples/text-memory-profiling/text-memory-profiling-example.cpp
+++ b/examples/text-memory-profiling/text-memory-profiling-example.cpp
@@ -329,7 +329,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/text-overlap/text-overlap-example.cpp b/examples/text-overlap/text-overlap-example.cpp
index 05f5e65..dbcf030 100644
--- a/examples/text-overlap/text-overlap-example.cpp
+++ b/examples/text-overlap/text-overlap-example.cpp
@@ -120,7 +120,7 @@ bool TextOverlapController::OnClicked( Button button )
 
 void TextOverlapController::OnKeyEvent( const KeyEvent& keyEvent )
 {
-  if( keyEvent.GetState() == KeyEvent::DOWN &&
+  if( keyEvent.GetState() == KeyEvent::Down &&
       ( IsKey( keyEvent, DALI_KEY_BACK ) ||
         IsKey( keyEvent, DALI_KEY_ESCAPE ) ) )
   {
diff --git a/examples/text-scrolling/text-scrolling-example.cpp b/examples/text-scrolling/text-scrolling-example.cpp
index 4144687..0350418 100644
--- a/examples/text-scrolling/text-scrolling-example.cpp
+++ b/examples/text-scrolling/text-scrolling-example.cpp
@@ -354,7 +354,7 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp
index 923aa08..32a1c76 100644
--- a/examples/textured-mesh/textured-mesh-example.cpp
+++ b/examples/textured-mesh/textured-mesh-example.cpp
@@ -183,7 +183,7 @@ public:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {
diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp
index b7d12f6..c558023 100644
--- a/examples/tilt/tilt-example.cpp
+++ b/examples/tilt/tilt-example.cpp
@@ -97,7 +97,7 @@ public:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/tooltip/tooltip-example.cpp b/examples/tooltip/tooltip-example.cpp
index 279b00e..cbd6667 100644
--- a/examples/tooltip/tooltip-example.cpp
+++ b/examples/tooltip/tooltip-example.cpp
@@ -117,7 +117,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/transitions/transition-application.cpp b/examples/transitions/transition-application.cpp
index 1a3c291..a0913fe 100644
--- a/examples/transitions/transition-application.cpp
+++ b/examples/transitions/transition-application.cpp
@@ -198,7 +198,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent& keyEvent )
 {
   static int keyPressed = 0;
 
-  if( keyEvent.GetState() == KeyEvent::DOWN)
+  if( keyEvent.GetState() == KeyEvent::Down)
   {
     if( keyPressed == 0 ) // Is this the first down event?
     {
@@ -214,7 +214,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent& keyEvent )
     }
     keyPressed = 1;
   }
-  else if( keyEvent.GetState() == KeyEvent::UP )
+  else if( keyEvent.GetState() == KeyEvent::Up )
   {
     keyPressed = 0;
   }
diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp
index fb5b5a3..6a39047 100644
--- a/examples/video-view/video-view-example.cpp
+++ b/examples/video-view/video-view-example.cpp
@@ -262,7 +262,7 @@ private:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.GetState() == KeyEvent::DOWN)
+    if(event.GetState() == KeyEvent::Down)
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {
diff --git a/examples/visual-fitting-mode/visual-fitting-mode-example.cpp b/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
index b9ca324..48e921f 100644
--- a/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
+++ b/examples/visual-fitting-mode/visual-fitting-mode-example.cpp
@@ -197,7 +197,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp
index 2d1bb62..0c08afe 100644
--- a/examples/visual-transitions/transition-application.cpp
+++ b/examples/visual-transitions/transition-application.cpp
@@ -324,7 +324,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent& keyEvent )
 {
   static int keyPressed = 0;
 
-  if( keyEvent.GetState() == KeyEvent::DOWN)
+  if( keyEvent.GetState() == KeyEvent::Down)
   {
     if( keyPressed == 0 ) // Is this the first down event?
     {
@@ -340,7 +340,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent& keyEvent )
     }
     keyPressed = 1;
   }
-  else if( keyEvent.GetState() == KeyEvent::UP )
+  else if( keyEvent.GetState() == KeyEvent::Up )
   {
     keyPressed = 0;
   }
diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp
index b50fb42..13cc242 100644
--- a/examples/web-view/web-view-example.cpp
+++ b/examples/web-view/web-view-example.cpp
@@ -114,7 +114,7 @@ public:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.GetState() == KeyEvent::DOWN )
+    if( event.GetState() == KeyEvent::Down )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 204ae55..a073d98 100644
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -699,7 +699,7 @@ void DaliTableView::SetupInnerPageCubeEffect()
 
 void DaliTableView::OnKeyEvent( const KeyEvent& event )
 {
-  if( event.GetState() == KeyEvent::DOWN )
+  if( event.GetState() == KeyEvent::Down )
   {
     if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {