From 0d96765d3bde205c6fbe3e7ceb6cd594fcef17b3 Mon Sep 17 00:00:00 2001 From: Geoff Norton Date: Fri, 21 Nov 2008 17:05:13 +0000 Subject: [PATCH] 2008-11-21 Geoff Norton * XplatUI.cs: Ensure that we can run on .net 2.0 with mono 2.2 where PlatformID.MacOSX now exists. svn path=/trunk/mcs/; revision=119637 --- .../Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 5 +++++ .../Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 436afd1c46b..3a5bc9ff40d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,8 @@ +2008-11-21 Geoff Norton + + * XplatUI.cs: Ensure that we can run on .net 2.0 with mono 2.2 where + PlatformID.MacOSX now exists. + 2008-11-20 Jonathan Pobst * TextBoxBase.cs: Provide a default implementation for ChangeBackColor. diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs index 4fe8da0b1c2..62d22259538 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs @@ -120,7 +120,7 @@ namespace System.Windows.Forms { public static bool RunningOnUnix { get { #if NET_2_0 - return (Environment.OSVersion.Platform == PlatformID.Unix); + return (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX); #else int platform = (int) Environment.OSVersion.Platform; return (platform == 128); -- 2.25.1