From 22291d22621f96dde5c45d600770c6091ebbd52c Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Mon, 26 Mar 2018 16:02:48 +0200
Subject: [PATCH] wxwidgets.cfg: Improved support for BEGIN_EVENT_TABLE and
 END_EVENT_TABLE-macros.

---
 cfg/wxwidgets.cfg | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 92d7872c2..ba7c2e119 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -1347,13 +1347,11 @@
   <define name="wxDECLARE_EVENT( name, type )" value=""/>
   <define name="wxDECLARE_NO_COPY_CLASS(classname)" value=""/>
   <define name="wxDEFINE_EVENT( name, type )" value=""/>
-  <!-- Override begin/end macros slightly differently -->
-  <!-- In order to avoid overriding all the possible event types we just replace with a semicolon -->
-  <!-- We could turn these into multi-line comments, but that wouldn't work if there was one inside the begin/end -->
-  <define name="BEGIN_EVENT_TABLE(a,b)" value=";"/>
-  <define name="END_EVENT_TABLE()" value=";"/>
-  <define name="wxBEGIN_EVENT_TABLE(a,b)" value=";"/>
-  <define name="wxEND_EVENT_TABLE()" value=";"/>
+  <define name="BEGIN_EVENT_TABLE(a,b)" value="wxBEGIN_EVENT_TABLE(a,b)"/>
+  <define name="END_EVENT_TABLE()" value="wxEND_EVENT_TABLE()"/>
+  <define name="wxBEGIN_EVENT_TABLE(theClass, baseClass)" value="const wxEventTable theClass::sm_eventTable = { &amp;baseClass::sm_eventTable, &amp;theClass::sm_eventTableEntries[0] }; const wxEventTable *theClass::GetEventTable() const { return &amp;theClass::sm_eventTable; } wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); wxEventHashTable &amp;theClass::GetEventHashTable() const { return theClass::sm_eventHashTable; } const wxEventTableEntry theClass::sm_eventTableEntries[] = {"/>
+  <define name="wxEND_EVENT_TABLE()" value="wxDECLARE_EVENT_TABLE_TERMINATOR() };"/>
+  <define name="wxDECLARE_EVENT_TABLE_TERMINATOR()" value="wxEventTableEntry(wxEVT_NULL, 0, 0, 0, 0)"/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html -->
   <!-- #define wxASSERT(condition) -->
   <define name="wxASSERT" value="assert"/>