X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.cpp;h=c91f71d93da360f072ebdd091ba52ef042c573ba;hb=43c5e7a1be2bb4b6eeb0755ad58aa20baa0095d1;hp=bf07f0627f073fe2fff4e3eabc36f7898eaa1a96;hpb=0de4495ae0ad22b60ce3d1257e30628ea518f377;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index bf07f06..c91f71d 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -34,6 +34,8 @@ #include #include #include +#include +#include namespace Dali { @@ -709,7 +711,7 @@ std::string TextSelectionPopup::GetPressedImage() const // Label properties. Property::Map buttonLabelProperties; - buttonLabelProperties.Insert( "text", button.caption ); + buttonLabelProperties.Insert( Toolkit::TextVisual::Property::TEXT, button.caption ); option.SetProperty( Toolkit::Button::Property::LABEL, buttonLabelProperties ); } if( showIcons ) @@ -804,7 +806,7 @@ std::string TextSelectionPopup::GetPressedImage() const } TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* callbackInterface ) -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mToolbar(), mPopupMaxSize(), mOptionMaxSize(),