From 407d7bb2a13361bbf0a640a25e735534a9da4fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C3=85=E2=84=A2=C3=83=C2=AD=20Techet?= Date: Wed, 11 Feb 2015 15:10:08 +0100 Subject: Don't disable adaptive speed of scrolling on OS X with GTK Quartz backend There does not seem to be any adaptive scroll speed control when using the Quartz backend so we can use the one provided by Scintilla. --- gtk/ScintillaGTK.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gtk') diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index d008215d0..0871ca224 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1990,10 +1990,11 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { // Compute amount and direction to scroll (even tho on win32 there is // intensity of scrolling info in the native message, gtk doesn't // support this so we simulate similarly adaptive scrolling) - // Note that this is disabled on OS X (Darwin) where the X11 server already has - // and adaptive scrolling algorithm that fights with this one + // Note that this is disabled on OS X (Darwin) with the X11 backend + // where the X11 server already has an adaptive scrolling algorithm + // that fights with this one int cLineScroll; -#if defined(__MWERKS__) || defined(__APPLE_CPP__) || defined(__APPLE_CC__) +#if defined(__APPLE__) && !defined(GDK_WINDOWING_QUARTZ) cLineScroll = sciThis->linesPerScroll; if (cLineScroll == 0) cLineScroll = 4; -- cgit v1.2.3