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
Merge "This patch is for refining dali application to support tizen c# application...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-popup-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
index
e4cef74
..
e2a9497
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
@@
-26,7
+26,6
@@
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/layer.h>
namespace Dali
#include <dali/public-api/actors/layer.h>
namespace Dali
@@
-38,9
+37,6
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-namespace
-{
-
enum PopupCustomisations
{
POPUP_MAXIMUM_SIZE,
enum PopupCustomisations
{
POPUP_MAXIMUM_SIZE,
@@
-49,8
+45,6
@@
enum PopupCustomisations
OPTION_DIVIDER_SIZE
};
OPTION_DIVIDER_SIZE
};
-} // namespace
-
class TextSelectionPopup : public Control
{
public:
class TextSelectionPopup : public Control
{
public: