Gay does mean happy, merry...
Queer does mean strange, awkward... It's not because it's not used in its right contest anymore that the meaning changed.
I can say that flower means goodbye, but that it's not because I use it flower as goodbye that flower means goodbye.
People use words for other meanings that they have, but that doesn't mean it's right, you can't just change what a word means just because years passed by...