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

	* gdipFunctions.cs: Ensure that System.Drawing works on the mac as
	well as unix.

svn path=/trunk/mcs/; revision=119827

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 4f4119642e3973cc252f4f08689d48fe67de2344..040c26f0e754bb84dc5a025506ddb93d9aa96fea 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-24  Geoff Norton  <gnorton@novell.com>
+
+       * gdipFunctions.cs: Ensure that System.Drawing works on the mac as 
+       well as unix.
+
 2008-11-21  Andreia Gaita  <shana@jitted.com>
 
        * Image.cs: On win32, when cloning images initialized from

diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
index 41bdc6063a1585595715c07b827e00492964ce8b..bec96897738f8de4e9f02aec7ca2b37a3c983176 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
+++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
@@ -99,7 +99,7 @@ namespace System.Drawing
                static GDIPlus ()
                {
                        int platform = (int) Environment.OSVersion.Platform;
-                       if ((platform == 4) || (platform == 128)) {
+                       if ((platform == 4) || (platform == 6) || (platform == 128)) {
                                if (Environment.GetEnvironmentVariable ("not_supported_MONO_MWF_USE_NEW_X11_BACKEND") != null || Environment.GetEnvironmentVariable ("MONO_MWF_MAC_FORCE_X11") != null) {
                                        UseX11Drawable = true;
                                } else {