From 1b496cde58bc02e4ee8ab7896a70480a57bc3dcc Mon Sep 17 00:00:00 2001
From: shun_iwasawa <shun_iwasawa@dwango.co.jp>
Date: Fri, 1 Dec 2017 15:13:10 +0900
Subject: [PATCH] disable the touch control by default

---
 toonz/sources/toonz/mainwindow.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 5adf58e3..1b62319d 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -86,13 +86,7 @@ TEnv::IntVar DockingCheckToggleAction("DockingCheckToggleAction", 0);
 TEnv::IntVar ShiftTraceToggleAction("ShiftTraceToggleAction", 0);
 TEnv::IntVar EditShiftToggleAction("EditShiftToggleAction", 0);
 TEnv::IntVar NoShiftToggleAction("NoShiftToggleAction", 0);
-// 11/30/2017 disable touch control by default in osx
-// as there seems to be a malfunction with trackpad
-#ifdef MACOSX
 TEnv::IntVar TouchGestureControl("TouchGestureControl", 0);
-#else
-TEnv::IntVar TouchGestureControl("TouchGestureControl", 1);
-#endif
 
 //=============================================================================
 namespace {