X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-input%2Ftext-input-popup-impl.cpp;h=a133275474ef674652a1cd856986b71318365364;hp=046041f20830b02e2f2388239c293bad4d60eb08;hb=88eec954ad7b59851b423be3b82a4af569f892dd;hpb=680c5587a1478717393d3a03cf6a17801edd00e0

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
index 046041f..a133275 100644
--- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
@@ -25,7 +25,6 @@
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 
-using namespace std;
 using namespace Dali;
 
 #define GET_LOCALE_TEXT(string) dgettext("sys_string", string)
@@ -424,12 +423,6 @@ void TextInputPopup::CreateOrderedListOfOptions()
         currentButton = CreateRequiredButton( ButtonsClipboard, mClipboardOptionPriority, OPTION_CLIPBOARD, GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD"), clipboardIcon, false );
         break;
       }
-      case ButtonsEnumEnd:
-      {
-        DALI_ASSERT_DEBUG( "ButtonsEnumEnd used but an invalid choice");
-        currentButton.orderOfPriority = 0;
-        break;
-      }
     }
 
     bool match = false;
@@ -525,7 +518,7 @@ void TextInputPopup::AddOption(const std::string& name, const std::string& capti
   optionPressedBackground.Add( pressedIcon );
 
   // 12. Set the pressed option image
-  option.SetPressedImage( optionPressedContainer );
+  option.SetSelectedImage( optionPressedContainer );
 
   // 13. Add the divider
   if ( !finalOption )
@@ -896,17 +889,17 @@ void TextInputPopup::OnShowFinished(Animation& source)
   mShowFinishedSignal.Emit( *this );
 }
 
-TextInputPopup::PressedSignalV2& TextInputPopup::PressedSignal()
+TextInputPopup::PressedSignalType& TextInputPopup::PressedSignal()
 {
   return mPressedSignal;
 }
 
-TextInputPopup::HideFinishedSignalV2& TextInputPopup::HideFinishedSignal()
+TextInputPopup::HideFinishedSignalType& TextInputPopup::HideFinishedSignal()
 {
   return mHideFinishedSignal;
 }
 
-TextInputPopup::ShowFinishedSignalV2& TextInputPopup::ShowFinishedSignal()
+TextInputPopup::ShowFinishedSignalType& TextInputPopup::ShowFinishedSignal()
 {
   return mShowFinishedSignal;
 }