Imported Upstream version 4.0.0~alpha1

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

View File

@ -26,7 +26,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;
@ -131,4 +130,3 @@ namespace System.Web.UI.Design.WebControls
}
}
}
#endif

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.Generic;
@ -60,4 +59,3 @@ namespace System.Web.UI.Design.WebControls
}
}
#endif

View File

@ -26,7 +26,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;
@ -178,4 +177,3 @@ namespace System.Web.UI.Design.WebControls
}
}
}
#endif

View File

@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.ComponentModel;
using System.Windows.Forms.Design;
@ -64,4 +63,3 @@ namespace System.Web.UI.Design.WebControls {
}
}
#endif

View File

@ -26,7 +26,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.ComponentModel;
using System.Globalization;
@ -80,4 +79,3 @@ namespace System.Web.UI.Design.WebControls
}
}
}
#endif

View File

@ -35,12 +35,7 @@ using System.Windows.Forms.Design;
namespace System.Web.UI.Design.WebControls {
public class ListControlDesigner :
#if NET_2_0
DataBoundControlDesigner
#else
ControlDesigner,
IDataSourceProvider
#endif
{
string data_key_field;
string data_member;
@ -52,7 +47,6 @@ namespace System.Web.UI.Design.WebControls {
{
}
#if NET_2_0
public override DesignerActionListCollection ActionLists {
get { throw new NotImplementedException (); }
}
@ -64,7 +58,6 @@ namespace System.Web.UI.Design.WebControls {
public string DataSource {
get; set;
}
#endif
public string DataKeyField {
get { return data_key_field; }
set { data_key_field = value; }
@ -85,7 +78,6 @@ namespace System.Web.UI.Design.WebControls {
set { data_value_field = value; }
}
#if NET_2_0
protected override void DataBind (BaseDataBoundControl dataBoundControl)
{
throw new NotImplementedException ();
@ -95,7 +87,6 @@ namespace System.Web.UI.Design.WebControls {
{
throw new NotImplementedException ();
}
#endif
public override string GetDesignTimeHtml ()
{