From fd67feedbcc367f6da1043c43e075faf1b79a2f1 Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Wed, 14 Oct 2020 16:05:14 +0200
Subject: [PATCH] Revert change to src/common/event.cpp

This change seems to be the most likely cause for
the bug crashing the GUI tests.
---
 src/common/event.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 88868785ef..a4f3659a97 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -596,7 +596,9 @@ void wxMouseEvent::Assign(const wxMouseEvent& event)
 {
     wxEvent::operator=(event);
 
-    *this = event;
+    // Borland C++ 5.82 doesn't compile an explicit call to an implicitly
+    // defined operator=() so need to do it this way:
+    *static_cast<wxMouseState *>(this) = event;
 
     m_x = event.m_x;
     m_y = event.m_y;
@@ -803,7 +805,9 @@ wxKeyEvent& wxKeyEvent::operator=(const wxKeyEvent& evt)
     {
         wxEvent::operator=(evt);
 
-        *this = evt;
+        // Borland C++ 5.82 doesn't compile an explicit call to an
+        // implicitly defined operator=() so need to do it this way:
+        *static_cast<wxKeyboardState *>(this) = evt;
 
         DoAssignMembers(evt);
     }