From 0f56843aa6fd4021ae9729f5dc438b83c345ebae Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Tue, 22 May 2012 09:54:01 +0200 Subject: [PATCH] remove last touch specific code ==> compile on PC too --- Sources/libewol/Android.mk | 2 -- .../libewol/ewol/widget/WidgetScrolled.cpp | 21 +------------------ 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Sources/libewol/Android.mk b/Sources/libewol/Android.mk index 5718b2e5..87b76dcd 100644 --- a/Sources/libewol/Android.mk +++ b/Sources/libewol/Android.mk @@ -12,7 +12,6 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz ifeq ($(DEBUG),1) LOCAL_CFLAGS := -D__PLATFORM__Android \ - -D__MODE__Touch \ -Wno-write-strings \ -DETK_DEBUG_LEVEL=3 \ -DEWOL_DEBUG_LEVEL=3 \ @@ -22,7 +21,6 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \ -frtti else LOCAL_CFLAGS := -D__PLATFORM__Android \ - -D__MODE__Touch \ -Wno-write-strings \ -DETK_DEBUG_LEVEL=1 \ -DEWOL_DEBUG_LEVEL=1 \ diff --git a/Sources/libewol/ewol/widget/WidgetScrolled.cpp b/Sources/libewol/ewol/widget/WidgetScrolled.cpp index 0ba63d44..6b91daa8 100644 --- a/Sources/libewol/ewol/widget/WidgetScrolled.cpp +++ b/Sources/libewol/ewol/widget/WidgetScrolled.cpp @@ -89,26 +89,6 @@ const char * const ewol::WidgetScrooled::GetObjectType(void) void ewol::WidgetScrooled::OnRegenerateDisplay(void) { - #ifdef __MODE__Touch - /* - if(ewol::SCROLL_ENABLE==m_highSpeedMode) { - ewol::OObject2DColored* myOObjectsColored = new ewol::OObject2DColored(); - myOObjectsColored->SetColor(1.0, 0.0, 0.0, 0.4); - myOObjectsColored->Disc(m_highSpeedStartPos.x, m_highSpeedStartPos.y, 10); - AddOObject(myOObjectsColored); - } - */ - #else - /* - if( ewol::SCROLL_ENABLE_HORIZONTAL==m_highSpeedMode - || ewol::SCROLL_ENABLE_VERTICAL ==m_highSpeedMode) { - ewol::OObject2DColored* myOObjectsColored = new ewol::OObject2DColored(); - myOObjectsColored->SetColor(1.0, 0.0, 0.0, 0.4); - myOObjectsColored->Disc(m_highSpeedStartPos.x, m_highSpeedStartPos.y, 10); - AddOObject(myOObjectsColored); - } - */ - #endif ClearOObjectList(); ewol::OObject2DColored* myOObjectsColored = NULL; if(m_size.y < m_maxSize.y || m_size.x < m_maxSize.x) { @@ -443,3 +423,4 @@ void ewol::WidgetScrooled::SetScrollingPositionDynamic(coord2D_ts borderWidth, c } } +