Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2015-01-13 23:29:38 +0300
committerZoltan Varga <vargaz@gmail.com>2015-01-13 23:29:38 +0300
commit0985d4aa4be4a9286db4e36cf75e3b18a31e5ff9 (patch)
tree46b65e83cd552237e592e85486afcca719d8a9c3 /mcs/class/System.Drawing.Design
parentf54652de26710952d4f80e25d87a87b346a86992 (diff)
[bcl] Remove NET_2_0 defines from the class libs. This has been done using: unifdef -t -DNET_2_0 -o <filename> <filename>.
Diffstat (limited to 'mcs/class/System.Drawing.Design')
-rw-r--r--mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs2
-rw-r--r--mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs2
-rw-r--r--mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemContainer.cs2
-rw-r--r--mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemCreator.cs2
-rw-r--r--mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxService.cs2
5 files changed, 0 insertions, 10 deletions
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs
index ae15e3fa022..d280c84d4b5 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/CursorEditor.cs
@@ -91,10 +91,8 @@ namespace System.Drawing.Design
{
return UITypeEditorEditStyle.DropDown;
}
-#if NET_2_0
public override bool IsDropDownResizable {
get { return true; }
}
-#endif
}
}
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs
index 8d26a58352f..6db0258b997 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ImageEditor.cs
@@ -130,12 +130,10 @@ namespace System.Drawing.Design
{
return new Bitmap (stream);
}
-#if NET_2_0
[MonoTODO]
protected virtual Type[] GetImageExtenders ()
{
throw new NotImplementedException ();
}
-#endif
}
}
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemContainer.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemContainer.cs
index 2b51e8c29aa..718852fd936 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemContainer.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemContainer.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System.Collections;
using System.Runtime.Serialization;
@@ -117,4 +116,3 @@ namespace System.Drawing.Design {
}
}
-#endif
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemCreator.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemCreator.cs
index 251f6c13fee..795ed482296 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemCreator.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxItemCreator.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System.Windows.Forms;
@@ -51,4 +50,3 @@ namespace System.Drawing.Design {
}
}
-#endif
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxService.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxService.cs
index 72a56fd2497..343c5a27c99 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxService.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ToolboxService.cs
@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System.Collections;
using System.ComponentModel.Design;
@@ -305,4 +304,3 @@ namespace System.Drawing.Design {
}
}
-#endif