[wx] Unreviewed build fixes after recent trunk changes.