X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ffocus-manager%2Fkeyboard-focus-manager.cpp;h=a816ca215380f55b9a67ea45bd54a4a5a9be3729;hp=45d0fbf9ef57c0543f6635f19146e1be8bc7ee14;hb=f4a28993f3f77f15015e5c9b4e1bedd06e23b926;hpb=dc3613bb6248908c267a76e378b04962bce85664 diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp index 45d0fbf..a816ca2 100644 --- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp +++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include // EXTERNAL INCLUDES +#include // for strcmp // INTERNAL INCLUDES @@ -59,7 +60,7 @@ Actor KeyboardFocusManager::GetCurrentFocusActor() return GetImpl(*this).GetCurrentFocusActor(); } -bool KeyboardFocusManager::MoveFocus(Control::KeyboardFocusNavigationDirection direction) +bool KeyboardFocusManager::MoveFocus(Control::KeyboardFocus::Direction direction) { return GetImpl(*this).MoveFocus(direction); } @@ -121,9 +122,9 @@ KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGr return GetImpl(*this).FocusGroupChangedSignal(); } -KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal() +KeyboardFocusManager::FocusedActorEnterKeySignalType& KeyboardFocusManager::FocusedActorEnterKeySignal() { - return GetImpl(*this).FocusedActorActivatedSignal(); + return GetImpl(*this).FocusedActorEnterKeySignal(); } } // namespace Toolkit