From 52e5b561cbd0a8a1198139a0d511ae4e948d03d4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Apr 2018 18:06:43 +0200
Subject: [PATCH] Apply Mac double buffering workaround for wxSTC correctly

The changes of bf418320b7e0c1659a768e439372d9eafb33c36b only modified
the generated file instead of modifying the file it's generated from, so
were lost during subsequent regenerations.

Fix this by back-propagating them to the correct place.

See #18085.
---
 src/stc/stc.cpp.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index d4af95790c..827633364d 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -224,8 +224,9 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     // STC doesn't support RTL languages at all
     SetLayoutDirection(wxLayout_LeftToRight);
 
-    // Rely on native double buffering by default.
-#if wxALWAYS_NATIVE_DOUBLE_BUFFER
+    // Rely on native double buffering by default, except under Mac where it
+    // doesn't work for some reason, see #18085.
+#if wxALWAYS_NATIVE_DOUBLE_BUFFER && !defined(__WXMAC__)
     SetBufferedDraw(false);
 #else
     SetBufferedDraw(true);