71ed744c76
Avoid using plenty of intermediate macros, which made the code quite difficult to understand and just wxDO_IF() helper directly instead. This makes individual macros definitions slightly longer, but allows to get rid of several helper macros, so the total number of lines is actually smaller but, more importantly, the new code is much easier to parse for a human reader.