trailing whitespace, better ifdef of xwidget code