2008-11-21 Geoff Norton <gnorton@novell.com>

        * 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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 436afd1c46b3cf3ca9a52979876db3964cb747a7..3a5bc9ff40de9146957812c03592e25dcf55011a 100644 (file)
--- 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  <gnorton@novell.com>
+
+       * 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  <monkey@jpobst.com>
 
        * 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 4fe8da0b1c232c5d019d68ba423dd16c40e26a08..62d222595386ec7d712ed66383fbd02f4c78ded3 100644 (file)
--- 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);