From 43f5d71410388e3475731f38ee49512fda17abf4 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Wed, 2 Jan 2019 13:25:43 +0100
Subject: [PATCH] wxwidgets.cfg: Improved support for macros from wx/listctrl.h
 and for some assert macros.

---
 cfg/wxwidgets.cfg | 80 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 4 deletions(-)

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index c4033747d..977c7ac33 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -1826,13 +1826,85 @@
   <define name="wxDECLARE_EVENT_TABLE_TERMINATOR()" value=""/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html -->
   <!-- #define wxASSERT(condition) -->
-  <define name="wxASSERT" value="assert"/>
+  <define name="wxASSERT(condition)" value="assert(condition)"/>
   <!-- #define wxASSERT_MSG(condition, message) -->
-  <define name="wxASSERT_MSG" value="assert"/>
+  <define name="wxASSERT_MSG(condition, message)" value="assert(condition)"/>
   <!-- #define wxASSERT_LEVEL_2(condition) -->
-  <define name="wxASSERT_LEVEL_2" value="assert"/>
+  <define name="wxASSERT_LEVEL_2(condition)" value="assert(condition)"/>
   <!-- #define wxASSERT_LEVEL_2_MSG(condition, message) -->
-  <define name="wxASSERT_LEVEL_2_MSG" value="assert"/>
+  <define name="wxASSERT_LEVEL_2_MSG(condition, msg)" value="assert(condition)"/>
+  <define name="wxCHECK2_MSG(condition, operation, message)" value="if( !(condition) ) { operation; }"/>
+  <define name="wxCHECK2(condition, operation)" value="if( !(condition) ) { operation; }"/>
+  <define name="wxCHECK(condition, retValue)" value="if( (condition) ) { return retValue; } else { exit(-1); }"/>
+  <define name="wxLC_ALIGN_LEFT" value="0x0080"/>
+  <define name="wxLC_ALIGN_TOP" value="0x0040"/>
+  <define name="wxLC_AUTOARRANGE" value="0x0100"/>
+  <define name="wxLC_EDIT_LABELS" value="0x0400"/>
+  <define name="wxLC_HRULES" value="0x0002"/>
+  <define name="wxLC_ICON" value="0x0004"/>
+  <define name="wxLC_LIST" value="0x0010"/>
+  <define name="wxLC_MASK_ALIGN" value="0xC0"/>
+  <define name="wxLC_MASK_SORT" value="0xC000"/>
+  <define name="wxLC_MASK_TYPE" value="0x3C"/>
+  <define name="wxLC_NO_HEADER" value="0x0800"/>
+  <define name="wxLC_NO_SORT_HEADER" value="0x1000"/>
+  <define name="wxLC_REPORT" value="0x0020"/>
+  <define name="wxLC_SINGLE_SEL" value="0x2000"/>
+  <define name="wxLC_SMALL_ICON" value="0x0008"/>
+  <define name="wxLC_SORT_ASCENDING" value="0x4000"/>
+  <define name="wxLC_SORT_DESCENDING" value="0x8000"/>
+  <define name="wxLC_VIRTUAL" value="0x0200"/>
+  <define name="wxLC_VRULES" value="0x0001"/>
+  <define name="wxLIST_GETSUBITEMRECT_WHOLEITEM" value="-1"/>
+  <define name="wxLIST_HITTEST_ABOVE" value="0x0001"/>
+  <define name="wxLIST_HITTEST_BELOW" value="0x0002"/>
+  <define name="wxLIST_HITTEST_NOWHERE" value="0x0004"/>
+  <define name="wxLIST_HITTEST_ONITEM" value="0x2A0"/>
+  <define name="wxLIST_HITTEST_ONITEMICON" value="0x0020"/>
+  <define name="wxLIST_HITTEST_ONITEMLABEL" value="0x0080"/>
+  <define name="wxLIST_HITTEST_ONITEMRIGHT" value="0x0100"/>
+  <define name="wxLIST_HITTEST_ONITEMSTATEICON" value="0x0200"/>
+  <define name="wxLIST_HITTEST_TOLEFT" value="0x0400"/>
+  <define name="wxLIST_HITTEST_TORIGHT" value="0x0800"/>
+  <define name="wxLIST_MASK_DATA" value="0x0008"/>
+  <define name="wxLIST_MASK_FORMAT" value="0x0040"/>
+  <define name="wxLIST_MASK_IMAGE" value="0x0004"/>
+  <define name="wxLIST_MASK_STATE" value="0x0001"/>
+  <define name="wxLIST_MASK_TEXT" value="0x0002"/>
+  <define name="wxLIST_MASK_WIDTH" value="0x0020"/>
+  <define name="wxLIST_SET_ITEM" value="0x0010"/>
+  <define name="wxLIST_STATE_CUT" value="0x0008"/>
+  <define name="wxLIST_STATE_DISABLED" value="0x0010"/>
+  <define name="wxLIST_STATE_DONTCARE" value="0x0000"/>
+  <define name="wxLIST_STATE_DROPHILITED" value="0x0001"/>
+  <define name="wxLIST_STATE_FILTERED" value="0x0020"/>
+  <define name="wxLIST_STATE_FOCUSED" value="0x0002"/>
+  <define name="wxLIST_STATE_INUSE" value="0x0040"/>
+  <define name="wxLIST_STATE_PICKED" value="0x0080"/>
+  <define name="wxLIST_STATE_SELECTED" value="0x0004"/>
+  <define name="wxLIST_STATE_SOURCE" value="0x0100"/>
+  <define name="wxLIST_NEXT_ABOVE" value="0"/>
+  <define name="wxLIST_NEXT_ALL" value="1"/>
+  <define name="wxLIST_NEXT_BELOW" value="2"/>
+  <define name="wxLIST_NEXT_LEFT" value="3"/>
+  <define name="wxLIST_NEXT_RIGHT" value="4"/>
+  <define name="wxLIST_ALIGN_DEFAULT" value="0"/>
+  <define name="wxLIST_ALIGN_LEFT" value="1"/>
+  <define name="wxLIST_ALIGN_TOP" value="2"/>
+  <define name="wxLIST_ALIGN_SNAP_TO_GRID" value="3"/>
+  <define name="wxLIST_AUTOSIZE" value="0"/>
+  <define name="wxLIST_AUTOSIZE_USEHEADER" value="1"/>
+  <define name="wxLIST_RECT_BOUNDS" value="0"/>
+  <define name="wxLIST_RECT_ICON" value="1"/>
+  <define name="wxLIST_RECT_LABEL" value="2"/>
+  <define name="wxLIST_FIND_UP" value="0"/>
+  <define name="wxLIST_FIND_DOWN" value="1"/>
+  <define name="wxLIST_FIND_LEFT" value="2"/>
+  <define name="wxLIST_FIND_RIGHT" value="3"/>
+  <define name="wxLIST_FORMAT_LEFT" value="0"/>
+  <define name="wxLIST_FORMAT_RIGHT" value="1"/>
+  <define name="wxLIST_FORMAT_CENTRE" value="2"/>
+  <define name="wxLIST_FORMAT_CENTER" value="3"/>
   <define name="wxFILTER_NONE" value="0"/>
   <define name="wxFILTER_EMPTY" value="1"/>
   <define name="wxFILTER_ASCII" value="2"/>