Make the code more readable by removing the unnecessary macros. Closes https://github.com/wxWidgets/wxWidgets/pull/888