2008-11-21 Jonathan Pobst <monkey@jpobst.com>

	* XPlatUI.cs: Take new Platform.MacOSX into account.
	[Fixes bug #447663]

svn path=/branches/mono-2-2/mcs/; revision=119638

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index b73d8c21d773e3c4aad2653f333bfe2ac60df4d6..50bb32f773b55b7b662fa56cfdf05713fcac6139 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  Jonathan Pobst  <monkey@jpobst.com>
+
+       * XPlatUI.cs: Take new Platform.MacOSX into account.
+       [Fixes bug #447663]
+
 2008-11-20  Jonathan Pobst  <monkey@jpobst.com>
 
        * ComboBox.cs: Call HideWindow instead of Hide when closing the dropdown

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);