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:
authorMiguel de Icaza <miguel@gnome.org>2011-03-17 04:46:02 +0300
committerMiguel de Icaza <miguel@gnome.org>2011-03-17 04:46:02 +0300
commit48292550e883d1c4bab634c0eb285246d5b52fce (patch)
treed1802ec08f1bdd79dfa5e9d33632fa793310f986 /mcs/class/System/Microsoft.Win32
parent081169a87d55ba4ce78fbb6d1814b16aec17538e (diff)
More NET_2_0 define removal
Diffstat (limited to 'mcs/class/System/Microsoft.Win32')
-rw-r--r--mcs/class/System/Microsoft.Win32/IntranetZoneCredentialPolicy.cs4
-rw-r--r--mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs3
-rw-r--r--mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs4
-rw-r--r--mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs4
-rw-r--r--mcs/class/System/Microsoft.Win32/SystemEvents.cs2
-rw-r--r--mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs2
6 files changed, 0 insertions, 19 deletions
diff --git a/mcs/class/System/Microsoft.Win32/IntranetZoneCredentialPolicy.cs b/mcs/class/System/Microsoft.Win32/IntranetZoneCredentialPolicy.cs
index e8c377229f9..5b122da0212 100644
--- a/mcs/class/System/Microsoft.Win32/IntranetZoneCredentialPolicy.cs
+++ b/mcs/class/System/Microsoft.Win32/IntranetZoneCredentialPolicy.cs
@@ -26,8 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
using System;
using System.Net;
using System.Security;
@@ -51,5 +49,3 @@ namespace Microsoft.Win32 {
}
}
}
-
-#endif
diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs
index 888300bf40a..47a1fa3cdce 100644
--- a/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs
+++ b/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs
@@ -26,8 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
using System.Security.Permissions;
namespace Microsoft.Win32 {
@@ -49,4 +47,3 @@ namespace Microsoft.Win32 {
}
}
-#endif
diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs
index 38c9ee8dee7..6059e27f41d 100644
--- a/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs
+++ b/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs
@@ -26,11 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
namespace Microsoft.Win32 {
public delegate void SessionSwitchEventHandler (object sender, SessionSwitchEventArgs e);
}
-
-#endif
diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs
index 31c13d61b9e..0d1ccd8515f 100644
--- a/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs
+++ b/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs
@@ -26,8 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
namespace Microsoft.Win32 {
public enum SessionSwitchReason {
@@ -42,5 +40,3 @@ namespace Microsoft.Win32 {
SessionRemoteControl
}
}
-
-#endif
diff --git a/mcs/class/System/Microsoft.Win32/SystemEvents.cs b/mcs/class/System/Microsoft.Win32/SystemEvents.cs
index 76fd57c5e9f..2496edeecdf 100644
--- a/mcs/class/System/Microsoft.Win32/SystemEvents.cs
+++ b/mcs/class/System/Microsoft.Win32/SystemEvents.cs
@@ -88,13 +88,11 @@ namespace Microsoft.Win32 {
add { }
remove { }
}
-#if NET_2_0
[MonoTODO("Currently does nothing on Mono")]
public static event EventHandler DisplaySettingsChanging {
add { }
remove { }
}
-#endif
[MonoTODO("Currently does nothing on Mono")]
public static event System.EventHandler EventsThreadShutdown
{
diff --git a/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs b/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs
index 399b688b23a..0c162a375fc 100644
--- a/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs
+++ b/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs
@@ -44,8 +44,6 @@ namespace Microsoft.Win32 {
Screensaver = 11,
Window = 12,
Locale = 13,
-#if NET_2_0
VisualStyle
-#endif
}
}