I think that independently of what wxWhatever container we use for Scintilla, we should always use the latest version of scintilla and patch it according to our needs (it'd be better if we used additional files for our new functions so future versions don't have to be repatched).