X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=b95e648eb3395ba61d0b640c4ec6c0279448a813;hb=666b4b2f13d2f417557180a8440c6686c5dbfe83;hp=174d893c825f5f7f1f513ce768e0038bfd84cada;hpb=286089d715eb4c5e704884284cce67549685dbc5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 174d893..b95e648 100644
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -1795,7 +1795,7 @@ bool Popup::OnKeyEvent( const KeyEvent& event )
 
   bool consumed = false;
 
-  if( event.GetState() == KeyEvent::Down )
+  if( event.GetState() == KeyEvent::DOWN )
   {
     if (event.GetKeyCode() == Dali::DALI_KEY_ESCAPE || event.GetKeyCode() == Dali::DALI_KEY_BACK)
     {
@@ -1963,17 +1963,17 @@ void Popup::SetupTouch()
   if( ! mTouchTransparent )
   {
     // Connect all the signals and set us up to consume all touch events
-    mBacking.TouchSignal().Connect( this, &Popup::OnBackingTouched );
-    mPopupBackgroundImage.TouchSignal().Connect( this, &Popup::OnDialogTouched );
-    mPopupLayout.TouchSignal().Connect( this, &Popup::OnDialogTouched );
+    mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched );
+    mPopupBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
+    mPopupLayout.TouchedSignal().Connect( this, &Popup::OnDialogTouched );
     mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, true );
   }
   else
   {
     // We are touch transparent so disconnect all signals and ensure our layer does not consumed all touch events
-    mBacking.TouchSignal().Disconnect( this, &Popup::OnBackingTouched );
-    mPopupBackgroundImage.TouchSignal().Disconnect( this, &Popup::OnDialogTouched );
-    mPopupLayout.TouchSignal().Disconnect( this, &Popup::OnDialogTouched );
+    mBacking.TouchedSignal().Disconnect( this, &Popup::OnBackingTouched );
+    mPopupBackgroundImage.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched );
+    mPopupLayout.TouchedSignal().Disconnect( this, &Popup::OnDialogTouched );
     mLayer.SetProperty( Layer::Property::CONSUMES_TOUCH, false );
   }
 }