projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add EmitKeyInputFocusSignal to control-wrapper-impl
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-wrapper-impl.cpp
diff --git
a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
index
8c7a76e
..
1a2ec4b
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.cpp
@@
-23,6
+23,7
@@
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/devel-api/object/handle-devel.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/devel-api/object/handle-devel.h>
+#include <dali/devel-api/actors/custom-actor-devel.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
@@
-125,7
+126,7
@@
void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Bas
DevelControl::RegisterVisual( *this, index, visual );
}
DevelControl::RegisterVisual( *this, index, visual );
}
-void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual,
floa
t depthIndex )
+void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual,
in
t depthIndex )
{
DevelControl::RegisterVisual( *this, index, visual, depthIndex );
}
{
DevelControl::RegisterVisual( *this, index, visual, depthIndex );
}
@@
-135,7
+136,7
@@
void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Bas
DevelControl::RegisterVisual( *this, index, visual, enabled );
}
DevelControl::RegisterVisual( *this, index, visual, enabled );
}
-void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled,
floa
t depthIndex )
+void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled,
in
t depthIndex )
{
DevelControl::RegisterVisual( *this, index, visual, enabled, depthIndex );
}
{
DevelControl::RegisterVisual( *this, index, visual, enabled, depthIndex );
}
@@
-179,6
+180,16
@@
void ControlWrapper::ApplyThemeStyle()
}
}
}
}
+Dali::TypeInfo ControlWrapper::GetTypeInfo()
+{
+ return DevelCustomActor::GetTypeInfo(Self());
+}
+
+void ControlWrapper::EmitKeyInputFocusSignal( bool focusGained )
+{
+ Control::EmitKeyInputFocusSignal( focusGained );
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit