From 75e9090ffcd0364ccf3d39c98c4628b119667c7e Mon Sep 17 00:00:00 2001 From: mitchell Date: Tue, 13 Mar 2018 17:56:13 -0400 Subject: Update GTK+ version requirements. --- README | 2 +- doc/ScintillaDoc.html | 6 +++--- win32/makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index d1ce4db18..45e4ef84c 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ To build SciTE, Scintilla must first be built. *** GTK+/Linux version *** -You must first have GTK+ 2.18 or later and GCC (4.8 or better) installed. +You must first have GTK+ 2.24 or later and GCC (4.8 or better) installed. Clang may be used by adding CLANG=1 to the make command line. Other C++ compilers may work but may require tweaking the make file. Either GTK+ 2.x or 3.x may be used with 2.x the default and 3.x diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index a6a5d0a48..78a9bf36d 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -6548,7 +6548,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ On GTK+, there are storage and performance costs to accessibility, so it can be disabled by calling SCI_SETACCESSIBILITY.

- + @@ -6578,7 +6578,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
- +

Lexer

If you define the symbol SCI_LEXER when building Scintilla, (this is sometimes @@ -8182,7 +8182,7 @@ EM_SETTARGETDEVICE directories. The compiler must support C++11. For Windows, GCC 4.8 or Microsoft Visual C++ 2015 can be used - for building. For GTK+, GCC 4.8 or newer should be used. GTK+ 2.18+ and 3.x are + for building. For GTK+, GCC 4.8 or newer should be used. GTK+ 2.24+ and 3.x are supported with glib 2.22+. The version of GTK+ installed should be detected automatically. When both GTK+ 2 and GTK+ 3 are present, building for GTK+ 3.x requires defining GTK3 on the command line.

diff --git a/win32/makefile b/win32/makefile index f3b75d796..2801a4234 100644 --- a/win32/makefile +++ b/win32/makefile @@ -1,7 +1,7 @@ # Make file for Scintilla on Windows # Copyright 1998-2010 by Neil Hodgson # The License.txt file describes the conditions under which this software may be distributed. -# This makefile assumes the MinGW32 version of GCC 4.x is used and changes will +# This makefile assumes the MinGW32 version of GCC 4.8+ is used and changes will # be needed to use other compilers. ifdef CLANG -- cgit v1.2.3