X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=0d7b93c6f7972b9df01e38c1d0b1f403881ca3c1;hp=f323bb69310e990cfd02f1160fe3b091daeefc48;hb=bf58973c37b31d52707463a1e9cdecdbe91099f6;hpb=779ede6f67d2f7497a17df8c4bf1380419eb4e65 diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index f323bb6..0d7b93c 100644 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -1532,7 +1532,7 @@ bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra return connected; } -bool Popup::OnBackingTouched( Actor actor, const TouchData& touch ) +bool Popup::OnBackingTouched( Actor actor, const TouchEvent& touch ) { // Allow events to pass through if the backing isn't the hit-actor if( (touch.GetHitActor(0) == actor) && @@ -1559,7 +1559,7 @@ bool Popup::OnBackingWheelEvent( Actor actor, const WheelEvent& event ) return true; } -bool Popup::OnDialogTouched( Actor actor, const TouchData& touch ) +bool Popup::OnDialogTouched( Actor actor, const TouchEvent& touch ) { // Only connecting this so the backing does not become the default hit-actor and inadvertently closes the popup return false;