Author: kostat
Date: 2007-05-30 11:03:15 -0400 (Wed, 30 May 2007)
New Revision: 78226

Modified:
   
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Design/ToolboxItem.cs
   
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
Log:
merge -r 78223:78224

Modified: 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs
===================================================================
--- 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs  
    2007-05-30 14:59:35 UTC (rev 78225)
+++ 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing/Graphics.jvm.cs  
    2007-05-30 15:03:15 UTC (rev 78226)
@@ -660,7 +660,7 @@
                        DrawImage(image, destPoints, srcRect, srcUnit, null);
                }
 
-               [MonoTODO]
+               [MonoLimitation("ImageAttributes parameter is ignored.")]
                public void DrawImage (Image image, Point [] destPoints, 
Rectangle srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr) {
                        //TBD: ImageAttributes
                        if (srcUnit != GraphicsUnit.Pixel)
@@ -672,8 +672,8 @@
                        Region region = new Region(srcRect);
                        DrawImage(image, mx, region);
                }
-               
-               [MonoTODO]
+
+               [MonoLimitation ("ImageAttributes parameter is ignored.")]
                public void DrawImage (Image image, PointF [] destPoints, 
RectangleF srcRect, GraphicsUnit srcUnit, ImageAttributes imageAttr) {
                        //TBD: ImageAttributes
                        if (srcUnit != GraphicsUnit.Pixel)
@@ -716,9 +716,8 @@
                public void DrawImage (Image image, Rectangle destRect, float 
srcX, float srcY, float srcWidth, float srcHeight, GraphicsUnit srcUnit) {
                        DrawImage(image, destRect, srcX, srcY, srcWidth, 
srcHeight, srcUnit, null);
                }
-               
 
-               [MonoTODO]
+               [MonoLimitation ("ImageAttributes parameter is ignored.")]
                public void DrawImage (Image image, Rectangle destRect, int 
srcX, int srcY, int srcWidth, int srcHeight, GraphicsUnit srcUnit, 
ImageAttributes imageAttr) {                     
                        //TBD: attributes
                        DrawImage(
@@ -727,8 +726,8 @@
                                new Rectangle(srcX, srcY, srcWidth, srcHeight),
                                srcUnit);
                }
-               
-               [MonoTODO]
+
+               [MonoLimitation ("ImageAttributes parameter is ignored.")]
                public void DrawImage (Image image, Rectangle destRect, float 
srcX, float srcY, float srcWidth, float srcHeight, GraphicsUnit srcUnit, 
ImageAttributes imageAttrs) {
                        //TBD: attributes
                        DrawImage(

Modified: 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Design/ToolboxItem.cs
===================================================================
--- 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Design/ToolboxItem.cs
        2007-05-30 14:59:35 UTC (rev 78225)
+++ 
branches/mainsoft/gh20/mcs/class/System.Drawing/System.Drawing.Design/ToolboxItem.cs
        2007-05-30 15:03:15 UTC (rev 78226)
@@ -187,7 +187,7 @@
                        throw new NotImplementedException ();
                } 
 
-               [MonoTODO] 
+               [MonoNotSupported("")] 
                public Type GetType (IDesignerHost host)
                {
                        if (host == null)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to