mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/System.Design/System.ComponentModel.Design/CollectionEditor.cs
View File

@ -382,14 +382,10 @@ namespace System.ComponentModel.Design
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.ResumeLayout (false);
#if NET_2_0
if (editor.CollectionType.IsGenericType)
this.Text = editor.CollectionItemType.Name + " Collection Editor";
else
this.Text = editor.CollectionType.Name + " Collection Editor";
#else
this.Text = editor.CollectionType.Name + " Collection Editor";
#endif
foreach (Type type in editor.NewItemTypes)
addType.Items.Add (type.Name);
if (addType.Items.Count > 0)
@ -632,11 +628,7 @@ namespace System.ComponentModel.Design
}
if (instance == null) {
#if NET_2_0
instance = TypeDescriptor.CreateInstance (provider, itemType, null, null);
#else
instance = Activator.CreateInstance (itemType);
#endif
}
return instance;
}