From 8baed11d7ef1fd794cbbdf250e96b7cefec34ca0 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 3 Sep 2015 18:21:03 +1000
Subject: Removing support for old GTK+ versions. Minimum GTK+ is 2.18 with
 glib 2.22.

---
 doc/ScintillaDoc.html     | 4 ++--
 doc/ScintillaHistory.html | 3 +++
 gtk/PlatGTK.cxx           | 7 +------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 2bfcff27c..263628f4c 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -7678,8 +7678,8 @@ EM_SETTARGETDEVICE
 
     <p>To build Scintilla or SciTE, see the README file present in both the Scintilla and SciTE
     directories. For Windows, GCC 4.7 or Microsoft Visual C++ 2010 can be used
-    for building. For GTK+, GCC 4.1 or newer should be used. GTK+ 2.8+ and 3.x are
-    supported. The version of GTK+ installed should be detected automatically.
+    for building. For GTK+, GCC 4.4 or newer should be used. GTK+ 2.18+ 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.</p>
 
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 765e281d5..9711938d8 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -494,6 +494,9 @@
 	Released 3 August 2015.
 	</li>
 	<li>
+	The oldest version of GTK+ supported now is 2.18 and for glib it is 2.22.
+	</li>
+	<li>
 	On GTK+, SC_CHARSET_OEM866 added to allow editing Russian files encoded in code page 866.
 	<a href="http://sourceforge.net/p/scintilla/feature-requests/1019/">Feature #1019.</a>
 	</li>
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 3f7fc7ec0..c63583cf3 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -2078,12 +2078,7 @@ Menu::Menu() : mid(0) {}
 void Menu::CreatePopUp() {
 	Destroy();
 	mid = gtk_menu_new();
-#if GLIB_CHECK_VERSION(2,10,0)
-	 g_object_ref_sink(G_OBJECT(mid));
-#else
-	g_object_ref(G_OBJECT(mid));
-	gtk_object_sink(GTK_OBJECT(G_OBJECT(mid)));
-#endif
+	g_object_ref_sink(G_OBJECT(mid));
 }
 
 void Menu::Destroy() {
-- 
cgit v1.2.3