merged changes from wine to edit control.