* ControlDesigner.cs: Merge with Miguel's version.