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

2
mcs/class/System.Design/System.ComponentModel.Design/ActiveDesignSurfaceChangedEventArgs.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
@@ -55,4 +54,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/ActiveDesignSurfaceChangedEventHandler.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
@@ -37,4 +36,3 @@ namespace System.ComponentModel.Design
public delegate void ActiveDesignSurfaceChangedEventHandler (object sender, ActiveDesignSurfaceChangedEventArgs e);
}
#endif

12
mcs/class/System.Design/System.ComponentModel.Design/ByteViewer.cs
View File

@@ -34,11 +34,7 @@ namespace System.ComponentModel.Design
{
[DesignTimeVisible(false)]
[ToolboxItem(false)]
#if NET_2_0
public class ByteViewer : TableLayoutPanel
#else
public class ByteViewer : Control
#endif
{
[MonoTODO]
public ByteViewer()
@@ -99,20 +95,12 @@ namespace System.ComponentModel.Design
throw new NotImplementedException();
}
#if NET_2_0
[MonoTODO]
protected override void OnLayout (LayoutEventArgs e)
{
throw new NotImplementedException();
}
#else
[MonoTODO]
protected override void OnResize (EventArgs e)
{
throw new NotImplementedException();
}
#endif
[MonoTODO]
protected virtual void ScrollChanged (object source, EventArgs e)

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;
}

2
mcs/class/System.Design/System.ComponentModel.Design/ComponentActionsType.cs
View File

@@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
namespace System.ComponentModel.Design
{
@@ -38,4 +37,3 @@ namespace System.ComponentModel.Design
Service,
}
}
#endif

14
mcs/class/System.Design/System.ComponentModel.Design/ComponentDesigner.cs
View File

@@ -35,11 +35,7 @@ using System.ComponentModel;
namespace System.ComponentModel.Design
{
#if NET_2_0
public class ComponentDesigner : ITreeDesigner, IDesigner, IDisposable, IDesignerFilter, IComponentInitializer
#else
public class ComponentDesigner : IDesigner, IDisposable, IDesignerFilter
#endif
{
#region ShadowPropertyCollection
@@ -98,9 +94,7 @@ namespace System.ComponentModel.Design
private IComponent _component;
private DesignerVerbCollection _verbs;
private ShadowPropertyCollection _shadowPropertyCollection;
#if NET_2_0
private DesignerActionListCollection _designerActionList;
#endif
// This property indicates any components to copy or move along with the component managed
// by the designer during a copy, drag, or move operation.
@@ -153,7 +147,6 @@ namespace System.ComponentModel.Design
}
}
#if NET_2_0
public virtual DesignerActionListCollection ActionLists {
get {
if (_designerActionList == null)
@@ -188,7 +181,6 @@ namespace System.ComponentModel.Design
{
InitializeNonDefault ();
}
#endif
public virtual void Initialize (IComponent component)
@@ -199,9 +191,7 @@ namespace System.ComponentModel.Design
_component = component;
}
#if NET_2_0
[Obsolete ("This method has been deprecated. Use InitializeExistingComponent instead.")]
#endif
public virtual void InitializeNonDefault ()
{
}
@@ -276,9 +266,7 @@ namespace System.ComponentModel.Design
#if NET_2_0
[Obsolete ("This method has been deprecated. Use InitializeNewComponent instead.")]
#endif
// The default implementation of this method sets the default property of the component to
// the name of the component if the default property is a string and the property is not already set.
// This method can be implemented in a derived class to customize the initialization of the component
@@ -383,7 +371,6 @@ namespace System.ComponentModel.Design
#endregion
#if NET_2_0
#region ITreeDesigner
// Returns a collection of the designers of the associated components
@@ -419,7 +406,6 @@ namespace System.ComponentModel.Design
}
#endregion
#endif
// Helper method - not an ISerivceProvider
//
protected virtual object GetService (Type service)

2
mcs/class/System.Design/System.ComponentModel.Design/DesignModeNestedContainer.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -138,4 +137,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignModeSite.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -211,4 +210,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurface.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -405,4 +404,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceCollection.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.ComponentModel;
@@ -138,4 +137,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceEventArgs.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.ComponentModel;
@@ -53,4 +52,3 @@ namespace System.ComponentModel.Design
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceEventHandler.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.ComponentModel;
@@ -38,4 +37,3 @@ namespace System.ComponentModel.Design
public delegate void DesignSurfaceEventHandler (Object sender, DesignSurfaceEventArgs e);
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceManager.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.ComponentModel;
@@ -248,4 +247,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignSurfaceServiceContainer.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -78,4 +77,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionHeaderItem.cs
View File

@@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Windows.Forms;
using System.Collections;
@@ -46,4 +45,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionItem.cs
View File

@@ -28,7 +28,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Windows.Forms;
using System.Collections;
@@ -86,4 +85,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionItemCollection.cs
View File

@@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Windows.Forms;
using System.Collections;
@@ -89,4 +88,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionList.cs
View File

@@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -73,4 +72,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionListCollection.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -123,4 +122,3 @@ namespace System.ComponentModel.Design
}
}
#endif

2
mcs/class/System.Design/System.ComponentModel.Design/DesignerActionListsChangedEventArgs.cs
View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Collections;
@@ -62,4 +61,3 @@ namespace System.ComponentModel.Design
}
}
}
#endif

Some files were not shown because too many files have changed in this diff Show More