Merge pull request #7304 from spycrab/wx_references Cleanup: Remove some left over references to wxWidgets
