fixing and expanding switches

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775