2007-11-15 Geoff Norton <gnorton@novell.com>

        * gdipFunctions.cs: Reflect the renamed environment variable in the new Carbon driver.
        * Graphics.cs: Remove support for the deprecated Cocoa driver until its fixed.

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

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index c5621372f67b6b7ac7e6fc17a5d6c8c59990e953..585a9da491a3104b197cddd2ee4204f5c0e7bbf3 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Geoff Norton  <gnorton@novell.com>
+
+       * gdipFunctions.cs: Reflect the renamed environment variable in the new Carbon driver.
+       * Graphics.cs: Remove support for the deprecated Cocoa driver until its fixed.
+
 2007-11-12  Sebastien Pouliot  <sebastien@ximian.com>
 
        * ColorTranslator.cs: Special case handling for LightGray versus 

diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
index 42a5a39487734d9b50521aa408ce3f8d61167735..251cdd60f12b9319df6a93b620e181311fc30891 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Graphics.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
@@ -1697,6 +1697,8 @@ namespace System.Drawing
                        IntPtr graphics;
 
                        if (GDIPlus.UseCocoaDrawable) {
+                               throw new NotImplementedException ();
+/* TODO: Fix this code to handle the new libgdiplus
                                CarbonContext context = Carbon.GetCGContextForNSView (hwnd);
                                GDIPlus.GdipCreateFromQuartz_macosx (context.ctx, context.width, context.height, out graphics);
                                
@@ -1704,6 +1706,7 @@ namespace System.Drawing
                                g.context = context;
                                
                                return g;
+*/
                        }
                        if (GDIPlus.UseQuartzDrawable) {
                                CarbonContext context = Carbon.GetCGContextForView (hwnd);

diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
index 7c2e24eac165c5aaa322a634bcd00a6f67b843f5..84c5cafc82a4402ee26246bbede0894f8a193a50 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
+++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
@@ -57,7 +57,7 @@ namespace System.Drawing
                public const int LANG_NEUTRAL = 0;
                public static IntPtr Display = IntPtr.Zero;
                public static bool UseX11Drawable;
-               public static bool UseQuartzDrawable = (Environment.GetEnvironmentVariable ("MONO_MWF_USE_QUARTZ_BACKEND") != null);
+               public static bool UseQuartzDrawable = (Environment.GetEnvironmentVariable ("MONO_MWF_USE_CARBON_BACKEND") != null);
                public static bool UseCocoaDrawable = (Environment.GetEnvironmentVariable ("MONO_GDIP_USE_COCOA_BACKEND") != null);
 
                #region gdiplus.dll functions