Fixed incorrect return buttons returned on mac os x

Fixed incorrect button id's would be returned (was the TODO) and added
all others defined default windows sets of buttons up to winver0500