wxwidgets.cfg: Improved support for BEGIN_EVENT_TABLE and END_EVENT_TABLE-macros.

This commit is contained in:
orbitcowboy 2018-03-26 16:02:48 +02:00
parent 3b935af90e
commit 22291d2262
1 changed files with 5 additions and 7 deletions

View File

@ -1347,13 +1347,11 @@
<define name="wxDECLARE_EVENT( name, type )" value=""/> <define name="wxDECLARE_EVENT( name, type )" value=""/>
<define name="wxDECLARE_NO_COPY_CLASS(classname)" value=""/> <define name="wxDECLARE_NO_COPY_CLASS(classname)" value=""/>
<define name="wxDEFINE_EVENT( name, type )" value=""/> <define name="wxDEFINE_EVENT( name, type )" value=""/>
<!-- Override begin/end macros slightly differently --> <define name="BEGIN_EVENT_TABLE(a,b)" value="wxBEGIN_EVENT_TABLE(a,b)"/>
<!-- In order to avoid overriding all the possible event types we just replace with a semicolon --> <define name="END_EVENT_TABLE()" value="wxEND_EVENT_TABLE()"/>
<!-- We could turn these into multi-line comments, but that wouldn't work if there was one inside the begin/end --> <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="BEGIN_EVENT_TABLE(a,b)" value=";"/> <define name="wxEND_EVENT_TABLE()" value="wxDECLARE_EVENT_TABLE_TERMINATOR() };"/>
<define name="END_EVENT_TABLE()" value=";"/> <define name="wxDECLARE_EVENT_TABLE_TERMINATOR()" value="wxEventTableEntry(wxEVT_NULL, 0, 0, 0, 0)"/>
<define name="wxBEGIN_EVENT_TABLE(a,b)" value=";"/>
<define name="wxEND_EVENT_TABLE()" value=";"/>
<!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html --> <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html -->
<!-- #define wxASSERT(condition) --> <!-- #define wxASSERT(condition) -->
<define name="wxASSERT" value="assert"/> <define name="wxASSERT" value="assert"/>