diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rwxr-xr-x | gtk/ScintillaGTK.cxx | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index b9b067600..9bd4e2a44 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -575,6 +575,7 @@ <td>Reinhard Nißl</td> <td>Ferdinand Oeinck</td> <td>Michael Heath</td> + <td>Enrico Tröger</td> </tr> </table> <h2>Releases</h2> @@ -600,6 +601,10 @@ <a href="https://sourceforge.net/p/scintilla/bugs/2374/">Bug #2374</a>. </li> <li> + On GTK on Win32, fix scrolling speed to not be too fast. + <a href="https://sourceforge.net/p/scintilla/bugs/2375/">Bug #2375</a>. + </li> + <li> On Qt, fix indicator drawing past left of text pane over margin. <a href="https://sourceforge.net/p/scintilla/bugs/2373/">Bug #2373</a>. </li> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index ec6f83058..168416bb7 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2000,7 +2000,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { // where the X11 server already has an adaptive scrolling algorithm // that fights with this one int cLineScroll; -#if defined(__APPLE__) && !defined(GDK_WINDOWING_QUARTZ) +#if (defined(__APPLE__) || defined(PLAT_GTK_WIN32)) && !defined(GDK_WINDOWING_QUARTZ) cLineScroll = sciThis->linesPerScroll; if (cLineScroll == 0) cLineScroll = 4; |