projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] ecore-wl2: applying ecore-wl2"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
common
/
ecore-indicator-impl.cpp
diff --git
a/dali/internal/window-system/common/ecore-indicator-impl.cpp
b/dali/internal/window-system/common/ecore-indicator-impl.cpp
index
b097c48
..
3c9a6b1
100644
(file)
--- a/
dali/internal/window-system/common/ecore-indicator-impl.cpp
+++ b/
dali/internal/window-system/common/ecore-indicator-impl.cpp
@@
-24,15
+24,11
@@
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <Ecore.h>
#include <Evas.h>
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <Ecore.h>
#include <Evas.h>
-#ifdef WAYLAND // WAYLAND
-#ifdef ECORE_WL2 //ECORE_WL2
-#include <Ecore_Wl2.h>
-#else //ECORE_WL2
+#ifdef WAYLAND
#include <Ecore_Wayland.h>
#include <Ecore_Wayland.h>
-#endif //ECORE_WL2
-#else // WAYLAND
+#else
#include <Ecore_X.h>
#include <Ecore_X.h>
-#endif
// WAYLAND
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-373,11
+369,7
@@
struct Indicator::Impl
{
#if defined(DALI_PROFILE_MOBILE)
#if defined(WAYLAND)
{
#if defined(DALI_PROFILE_MOBILE)
#if defined(WAYLAND)
-#if defined(ECORE_WL2)
- mEcoreEventHandler = ecore_event_handler_add(ECORE_WL2_EVENT_INDICATOR_FLICK, EcoreEventIndicator, this);
-#else
mEcoreEventHandler = ecore_event_handler_add(ECORE_WL_EVENT_INDICATOR_FLICK, EcoreEventIndicator, this);
mEcoreEventHandler = ecore_event_handler_add(ECORE_WL_EVENT_INDICATOR_FLICK, EcoreEventIndicator, this);
-#endif
#else
mEcoreEventHandler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, EcoreEventClientMessage, this);
#endif
#else
mEcoreEventHandler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, EcoreEventClientMessage, this);
#endif