It seems to me that around here on X Marks, the term "gentleman" has now morphed into some one who treats people well, but also must wear a lot of tweed, dress like someone from about 1936, adhere to a code of conduct based around the time of Prince Edward, probably smoke a pipe, and drink gin and tonic.
Hmm, that sounds more like a chap to me!