From ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 12 Mar 2018 18:20:24 -0400 Subject: Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm. Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required. Since C++11 includes regex capability, drop TRE dependency. --- src/scintilla_backports/6170_df221375187c.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/scintilla_backports/6170_df221375187c.patch (limited to 'src/scintilla_backports/6170_df221375187c.patch') diff --git a/src/scintilla_backports/6170_df221375187c.patch b/src/scintilla_backports/6170_df221375187c.patch deleted file mode 100644 index 28479b0a..00000000 --- a/src/scintilla_backports/6170_df221375187c.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1491548892 -36000 -# Node ID df221375187cab18a3e1c73ae83fa46805bf98db -# Parent ef932abba46c57933959a83bd63fafc429d35259 -Allowing assigning Windows and ensure cursorLast is initialized. - -diff -r ef932abba46c -r df221375187c include/Platform.h ---- a/include/Platform.h Thu Apr 06 21:04:52 2017 +1000 -+++ b/include/Platform.h Fri Apr 07 17:08:12 2017 +1000 -@@ -363,6 +363,14 @@ - virtual ~Window(); - Window &operator=(WindowID wid_) { - wid = wid_; -+ cursorLast = cursorInvalid; -+ return *this; -+ } -+ Window &operator=(const Window &other) { -+ if (this != &other) { -+ wid = other.wid; -+ cursorLast = other.cursorLast; -+ } - return *this; - } - WindowID GetID() const { return wid; } -- cgit v1.2.3