From 9bf1ad8233827f83fafd4d6c4522d8f373142197 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 7 Jul 2017 13:19:35 +1000
Subject: Backport: Bug [#1949]. Fix drawing failure in wrap mode for GTK+ 2.x.

Backport of changeset 6338:ebec660dcf48.
---
 doc/ScintillaHistory.html | 1 +
 gtk/ScintillaGTK.cxx      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 89127953e..76f7149cd 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -555,6 +555,7 @@
 	<li>
 	Fix drawing failure when in wrap mode for delete to start/end of line which
 	affects later lines but did not redraw them.
+	Also fixed drawing for wrap mode on GTK+ 2.x.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
 	</li>
 	<li>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 67177bb1c..aaf5c3fd7 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -2599,11 +2599,12 @@ gboolean ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *os
 		Paint(surfaceWindow.get(), rcPaint);
 		surfaceWindow->Release();
 		cairo_destroy(cr);
-		if (paintState == paintAbandoned) {
+		if ((paintState == paintAbandoned) || repaintFullWindow) {
 			// Painting area was insufficient to cover new styling or brace highlight positions
 			FullPaint();
 		}
 		paintState = notPainting;
+		repaintFullWindow = false;
 
 		if (rgnUpdate) {
 			gdk_region_destroy(rgnUpdate);
-- 
cgit v1.2.3