2003-11-13 Andreas Nahr <ClassDevelopment@A-SoftTech.com>

	* Bitmap.cs: Added Attributes
	* ColorTranslator.cs: Added private constructor
	* Font.cs: Added Attributes
	* FontFamily.cs: sealed
	* Icon.cs: Added Attributes
	* IconConverter.cs: Fixed signature
	* Image.cs: Added attributes
	* ImageAnimator.cs:
	* ImageConverter.cs:
	* ImageFormatConverter.cs:
	* SolidBrush.cs:
	* StringFormat.cs:
	* SystemBrushes.cs:
	* SystemColors.cs:
	* SystemIcons.cs:
	* SystemPens.cs:
	* TextureBrush.cs: Fixed signature
	* Color.cs: Added attributes
	* Point.cs:
	* PointF.cs:
	* Rectangle.cs:
	* Size.cs:
	* SizeF.cs: Added attributes
	* ContentAlignment.cs: Added attribute

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

diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
index f0b038b380931dc2cf9d2566214fa954be46605a..7737010352b64e4eceae5da34fc74e324e87a49f 100755 (executable)
--- a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
@@ -13,10 +13,13 @@ using System.IO;
 using System.Drawing.Imaging;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing {
 
        [Serializable]
+       [ComVisible (true)]
+       [Editor ("System.Drawing.Design.BitmapEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
        public sealed class Bitmap : Image {
                //
                // This one holds the actual memory buffer at the PixelFormat/height/width

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 70e975bbbea5411d0335e40145d5e521bfaec580..f7dd348f95809137bdf205a2dc3f423e4aef0168 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,30 @@
+2003-11-13  Andreas Nahr <ClassDevelopment@A-SoftTech.com>
+
+       * Bitmap.cs: Added Attributes
+       * ColorTranslator.cs: Added private constructor
+       * Font.cs: Added Attributes
+       * FontFamily.cs: sealed
+       * Icon.cs: Added Attributes
+       * IconConverter.cs: Fixed signature
+       * Image.cs: Added attributes
+       * ImageAnimator.cs: 
+       * ImageConverter.cs:
+       * ImageFormatConverter.cs:
+       * SolidBrush.cs:
+       * StringFormat.cs:
+       * SystemBrushes.cs:
+       * SystemColors.cs:
+       * SystemIcons.cs:
+       * SystemPens.cs:
+       * TextureBrush.cs: Fixed signature
+       * Color.cs: Added attributes
+       * Point.cs:
+       * PointF.cs:
+       * Rectangle.cs:
+       * Size.cs:
+       * SizeF.cs: Added attributes
+       * ContentAlignment.cs: Added attribute
+
 2003-11-13  Duncan Mak  <duncan@ximian.com>
 
        * Pen.cs (LineCape, LineJoin, MiterLimit, Transform): implemented.

diff --git a/mcs/class/System.Drawing/System.Drawing/Color.cs b/mcs/class/System.Drawing/System.Drawing/Color.cs
index 0bb005b14268374fb8e8ad1e1cc3c2e38b63f061..7d66bcabd4d41336e2ef32646c44f0800cdda3be 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Color.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Color.cs
@@ -13,12 +13,15 @@
 
 using System;
 using System.Collections;
+using System.Runtime.InteropServices;
 using System.ComponentModel;
 using System.Reflection;
 
 namespace System.Drawing 
 {
        [TypeConverter(typeof(ColorConverter))]
+       [ComVisible (true)]
+       [Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
        [Serializable]
        public struct Color
        {

diff --git a/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
index b41525f9ad1e28ea1fa7de63e5dc48d45f58be39..c6a6987234452f53eddff20d1eba236b96a9b27d 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
@@ -9,7 +9,12 @@
 // \r
 using System;\r
 namespace System.Drawing {\r
-       public class ColorTranslator{\r
+       public sealed class ColorTranslator{
+
+               private ColorTranslator ()
+               {
+               }
+\r
                // From converisons\r
                /// <summary>\r
                /// \r

diff --git a/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs b/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs
index 25dc8d25ce1267c76a4009abdd2b3e8f5986e394..3227fbb26707556c3501621fcfc7bd201f8f0613 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs
@@ -6,8 +6,11 @@
 //
 
 using System;
+using System.ComponentModel;
+
 namespace System.Drawing 
 {
+       [Editor ("System.Drawing.Design.ContentAlignmentEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
        public enum ContentAlignment {
                TopLeft      = 0x001,
                TopCenter    = 0x002,

diff --git a/mcs/class/System.Drawing/System.Drawing/Font.cs b/mcs/class/System.Drawing/System.Drawing/Font.cs
index e550a218cd94d16a3bdaddf94b6693e47fdc80c4..2a370ebcefd4f4108048e157ad9eb0ac75fa4b3b 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Font.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Font.cs
@@ -1,8 +1,13 @@
 using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing {
 
        [Serializable]
+       [ComVisible (true)]
+       [Editor ("System.Drawing.Design.FontEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
+       [TypeConverter(typeof(FontConverter))]
        public sealed class Font : MarshalByRefObject, ISerializable, ICloneable, IDisposable
        {
                private Font (SerializationInfo info, StreamingContext context)

diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
index 372e3814f4f1485ee32268dc032a761cad078857..9a4ddd8d34d14f53d43e4023332e63c51410941d 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
+++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
@@ -12,7 +12,7 @@ using System.Drawing.Text;
 
 namespace System.Drawing {
 
-       public class FontFamily : MarshalByRefObject, IDisposable {
+       public sealed class FontFamily : MarshalByRefObject, IDisposable {
                
                static FontFamily genericMonospace;
                static FontFamily genericSansSerif;

diff --git a/mcs/class/System.Drawing/System.Drawing/Icon.cs b/mcs/class/System.Drawing/System.Drawing/Icon.cs
index 7b7a75348f39cf78640b77f220fd9bfb9c29ca77..4edb14ee7060a54cc927b9b999df7efe9d5ee2b7 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Icon.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Icon.cs
@@ -10,11 +10,16 @@
 using System;
 using System.IO;
 using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing
 {
 
        [Serializable]
+       [ComVisible (false)]
+       [Editor ("System.Drawing.Design.IconEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
+       [TypeConverter(typeof(IconConverter))]
        public sealed class Icon : MarshalByRefObject, ISerializable, ICloneable, IDisposable
        {
 

diff --git a/mcs/class/System.Drawing/System.Drawing/IconConverter.cs b/mcs/class/System.Drawing/System.Drawing/IconConverter.cs
index 68d79cf23380401b76db27966f4272d5c24b8799..d3f8e5ffd5ad98176da7474d6963fb0e16b542cf 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/IconConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/IconConverter.cs
@@ -1,19 +1,24 @@
                                                                                                              //\r
 // System.Drawing.IconConverter.cs\r
 //\r
-// Author:\r
-//   Dennis Hayes (dennish@Raytek.com)\r
+// Authors:\r
+//   Dennis Hayes (dennish@Raytek.com)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)\r
 //\r
 // (C) 2002 Ximian, Inc\r
-//\r
-using System;\r
+//
+\r
+using System;
+using System.ComponentModel;\r
 \r
 namespace System.Drawing {\r
        /// <summary>\r
        /// Summary description for IconConverter.\r
        /// </summary>\r
-       public class IconConverter {\r
-               public IconConverter() {\r
+       public class IconConverter : ExpandableObjectConverter
+       {\r
+               public IconConverter()
+               {\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/System.Drawing/System.Drawing/Image.cs b/mcs/class/System.Drawing/System.Drawing/Image.cs
index c24adfc6ccd05c2569d4e418f26aab7467010ec7..258d5177a07414254dcda7b59418e412c7638ea2 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Image.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Image.cs
@@ -14,10 +14,15 @@ using System;
 using System.Runtime.Remoting;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
+using System.ComponentModel;
 using System.Drawing.Imaging;
 using System.IO;
 
 [Serializable]
+[ComVisible (true)]
+[Editor ("System.Drawing.Design.ImageEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
+[TypeConverter (typeof(ImageConverter))]
+[ImmutableObject (true)]
 public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISerializable 
 {
        public delegate bool GetThumbnailImageAbort ();

diff --git a/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs b/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
index cd27fb008fce566e132269fe0775773249625e30..46d4f799ddf072d67a4805743bd59f96a9c0267d 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ImageAnimator.cs
@@ -13,9 +13,9 @@ namespace System.Drawing
        /// <summary>\r
        /// Summary description for ImageAnimator.\r
        /// </summary>\r
-       public class ImageAnimator\r
+       public sealed class ImageAnimator\r
        {\r
-               public ImageAnimator()\r
+               private ImageAnimator ()\r
                {\r
                        //\r
                        // TODO: Add constructor logic here\r

diff --git a/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs b/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs
index 4a2e6cfe93504a3e9a957c72e07af355da4151b6..a4f9efb2102d8b99e00b03e3ec13191dbecf32df 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs
@@ -5,21 +5,20 @@
 //   Dennis Hayes (dennish@Raytek.com)\r
 //\r
 // (C) 2002 Ximian, Inc\r
-//\r
-using System;\r
+//
+\r
+using System;
+using System.ComponentModel;\r
 \r
 namespace System.Drawing\r
 {\r
        /// <summary>\r
        /// Summary description for ImageConverter.\r
        /// </summary>\r
-       public class ImageConverter\r
+       public class ImageConverter : TypeConverter\r
        {\r
                public ImageConverter()\r
                {\r
-                       //\r
-                       // TODO: Add constructor logic here\r
-                       //\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs b/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
index ea71b0444aa9479c706b3d3b7d4d53cfda3206ea..85d4b5a467ee2e8b3e01cbc1ad9e7601659cc0b2 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
@@ -1,19 +1,21 @@
 //\r
-// System.Drawing.FontConverter.cs\r
+// System.Drawing.ImageFormatConverter.cs\r
 //\r
 // Author:\r
 //   Dennis Hayes (dennish@Raytek.com)\r
 //\r
 // (C) 2002 Ximian, Inc\r
-//\r
-using System;\r
+//
+\r
+using System;
+using System.ComponentModel;\r
 \r
 namespace System.Drawing\r
 {\r
        /// <summary>\r
        /// Summary description for ImageFormatConverter.\r
        /// </summary>\r
-       public class ImageFormatConverter\r
+       public class ImageFormatConverter : TypeConverter\r
        {\r
                public ImageFormatConverter()\r
                {\r

diff --git a/mcs/class/System.Drawing/System.Drawing/Point.cs b/mcs/class/System.Drawing/System.Drawing/Point.cs
index 126326cd5087b65377601cc9d4c6e15fc2bc6897..de21009efeb2006710081a3db3ec8760f7a10502 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Point.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Point.cs
@@ -8,10 +8,14 @@
 //
 
 using System;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing {
 
        [Serializable]  
+       [ComVisible (true)]
+       [TypeConverter(typeof(PointConverter))]
        public struct Point { 
                
                // Private x and y coordinate fields.

diff --git a/mcs/class/System.Drawing/System.Drawing/PointF.cs b/mcs/class/System.Drawing/System.Drawing/PointF.cs
index 42895bdac4abf613949ff0004682a53dcecffc54..1a6c0f9fd080a2701cd404dcfa31ce78fa03cb69 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/PointF.cs
+++ b/mcs/class/System.Drawing/System.Drawing/PointF.cs
@@ -8,9 +8,11 @@
 //
 
 using System;
+using System.Runtime.InteropServices;
 
 namespace System.Drawing {
        
+       [ComVisible (true)]
        public struct PointF { 
                
                // Private x and y coordinate fields.

diff --git a/mcs/class/System.Drawing/System.Drawing/Rectangle.cs b/mcs/class/System.Drawing/System.Drawing/Rectangle.cs
index 2dd8b615368f6c0c8a8d9ee6f1c74959d1698cc2..90b8612cc435d09236879fc678932f80e2a1eda1 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Rectangle.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Rectangle.cs
@@ -9,10 +9,13 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing {
        
        [StructLayout(LayoutKind.Sequential)]
+       [ComVisible (true)]
+       [TypeConverter(typeof(RectangleConverter))]
        public struct Rectangle { 
                int x, y, width, height;
 

diff --git a/mcs/class/System.Drawing/System.Drawing/Size.cs b/mcs/class/System.Drawing/System.Drawing/Size.cs
index 3409d805321014633bef802c5171493d69e16e66..441c4c8b3ba751f1bf4bac0734bf1684f2d76b26 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Size.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Size.cs
@@ -9,10 +9,14 @@
 
 using System;
 using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
 namespace System.Drawing {
        
        [Serializable]
+       [ComVisible (true)]
+       [TypeConverter(typeof(SizeConverter))]
        public struct Size { 
                
                // Private Height and width fields.

diff --git a/mcs/class/System.Drawing/System.Drawing/SizeF.cs b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
index 1aa0155c56dcadc31293d57143cbc030e47ca759..1e51b4fb650e6c0643e5c861595b675162a2a0a0 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SizeF.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
@@ -8,9 +8,11 @@
 //
 
 using System;
+using System.Runtime.InteropServices;
 
 namespace System.Drawing {
-       
+
+       [ComVisible (true)]
        public struct SizeF { 
                
                // Private height and width fields.

diff --git a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
index 3a37377262454be0054a7865469a1364453ac191..0942e34c20a9ea2b86e00e2abb3ce24964065951 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SolidBrush.cs
@@ -11,7 +11,7 @@ using System;
 
 namespace System.Drawing
 {
-       public class SolidBrush : Brush {
+       public sealed class SolidBrush  : Brush {
                
                Color color;
 

diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormat.cs b/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
index 7603068272edf6a2e66d9fa1efe228de6537adb9..3deccbcbc0e5a218480872017c27fbabbbf96ea2 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
+++ b/mcs/class/System.Drawing/System.Drawing/StringFormat.cs
@@ -16,7 +16,7 @@ namespace System.Drawing
        /// <summary>\r
        /// Summary description for StringFormat.\r
        /// </summary>\r
-       public class StringFormat\r
+       public sealed class StringFormat\r
        {\r
                StringAlignment alignment;\r
                StringAlignment line_alignment;\r

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs b/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
index 88be1b262ffc1267c1e612fd4fdc4a74103e45cf..f417e89204deda97dfe7b4a695fe53c7ea8e3b48 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemBrushes.cs
@@ -13,14 +13,12 @@ namespace System.Drawing
        /// <summary>
        /// Summary description for SystemBrushes.
        /// </summary>
-       public class SystemBrushes
+       public sealed class SystemBrushes
        {
-               public SystemBrushes()
+               private SystemBrushes()
                {
-                       //
-                       // TODO: Add constructor logic here
-                       //
                }
+
                public static Brush ActiveBorder
                {       
                        get {

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemColors.cs b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
index d7367e21153715296671d54a286b0fbc60c966f4..bc9c47ac5af75f0d016c04cf2f98044ced45b279 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
@@ -1,5 +1,5 @@
 //
-// System.Drawing.SystemColors
+// System.Drawing.SystemColors.cs
 //
 // Authors:
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
@@ -14,6 +14,11 @@ namespace System.Drawing {
 
        public sealed class SystemColors
        {
+
+               private SystemColors ()
+               {
+               }
+
                static public Color ActiveBorder
                {       
                        get {

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemIcons.cs b/mcs/class/System.Drawing/System.Drawing/SystemIcons.cs
index fe66c14550075f4214e375538884de220c9bbf09..5d671a46e58e5c062b2fab8b053bfd5b58cafad7 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemIcons.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemIcons.cs
@@ -13,13 +13,10 @@ namespace System.Drawing
        /// <summary>\r
        /// Summary description for SystemIcons.\r
        /// </summary>\r
-       public class SystemIcons\r
+       public sealed class SystemIcons\r
        {\r
-               public SystemIcons()\r
+               private SystemIcons()\r
                {\r
-                       //\r
-                       // TODO: Add constructor logic here\r
-                       //\r
                }\r
        }\r
 }\r

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemPens.cs b/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
index bceb5f3ef4a38edecc9a3a914b67fb562fd6d7a1..b748c0940023640d3230bd867641e6e2b80660c1 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SystemPens.cs
@@ -48,6 +48,10 @@ namespace System.Drawing
                        window_frame = new Pen (SystemColors.WindowFrame);\r
                        window_text = new Pen (SystemColors.WindowText);\r
                        info_text = new Pen (SystemColors.InfoText);\r
+               }
+
+               private SystemPens ()
+               {
                }\r
                \r
                public static Pen ActiveCaptionText {\r

diff --git a/mcs/class/System.Drawing/System.Drawing/TextureBrush.cs b/mcs/class/System.Drawing/System.Drawing/TextureBrush.cs
index c12cb29b4ef9ddf6a84231aba4f4e2f204391ede..f62928b49d4e79e634cf32e2f5121e4887ea705e 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/TextureBrush.cs
+++ b/mcs/class/System.Drawing/System.Drawing/TextureBrush.cs
@@ -13,13 +13,16 @@ namespace System.Drawing
        /// <summary>\r
        /// Summary description for TextureBrush.\r
        /// </summary>\r
-       public class TextureBrush\r
+       public sealed class TextureBrush : Brush\r
        {\r
-               public TextureBrush()\r
+               internal TextureBrush()\r
                {\r
-                       //\r
-                       // TODO: Add constructor logic here\r
-                       //\r
+               }
+
+               [MonoTODO()]
+               public override object Clone()
+               {
+                       throw new NotImplementedException ();
                }\r
        }\r
 }\r