// Ravindra (rkumar@novell.com)
//
// Copyright (C) 2002 Ximian, Inc. http://www.ximian.com
-// Copyright (C) 2003 Novell, Inc. http://www.novell.com
+// Copyright (C) 2003,2004,2006,2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections;
using System.ComponentModel;
using System.Globalization;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;
+
+namespace System.Drawing {
-namespace System.Drawing
-{
- /// <summary>
- /// Summary description for SizeConverter.
- /// </summary>
public class SizeConverter : TypeConverter
{
public SizeConverter()
if (destinationType == typeof (string))
return true;
+ if (destinationType == typeof (InstanceDescriptor))
+ return true;
+
return base.CanConvertTo (context, destinationType);
}
CultureInfo culture,
object value)
{
+ if (culture == null)
+ culture = CultureInfo.CurrentCulture;
string s = value as string;
if (s == null)
return base.ConvertFrom (context, culture, value);
- string [] subs = s.Split (',');
+ string[] subs = s.Split (culture.TextInfo.ListSeparator.ToCharArray ());
+
+ Int32Converter converter = new Int32Converter ();
+ int[] numSubs = new int[subs.Length];
+ for (int i = 0; i < numSubs.Length; i++) {
+ numSubs[i] = (int) converter.ConvertFromString (context, culture, subs[i]);
+ }
+
if (subs.Length != 2)
throw new ArgumentException ("Failed to parse Text(" + s + ") expected text in the format \"Width,Height.\"");
- int width = Int32.Parse (subs [0]);
- int height = Int32.Parse (subs [1]);
-
- return new Size (width, height);
+ return new Size (numSubs[0], numSubs[1]);
}
public override object ConvertTo (ITypeDescriptorContext context,
object value,
Type destinationType)
{
- if ((destinationType == typeof (string)) && (value is Size))
- return value.ToString ();
+ if (culture == null)
+ culture = CultureInfo.CurrentCulture;
+ // LAMESPEC: "The default implementation calls the ToString method
+ // of the object if the object is valid and if the destination
+ // type is string." MS does not behave as per the specs.
+ // Oh well, we have to be compatible with MS.
+ if (value is Size) {
+ Size size = (Size) value;
+ if (destinationType == typeof (string)) {
+ return size.Width.ToString (culture) + culture.TextInfo.ListSeparator
+ + " " + size.Height.ToString (culture);
+ } else if (destinationType == typeof (InstanceDescriptor)) {
+ ConstructorInfo ctor = typeof(Size).GetConstructor (new Type[] {typeof(int), typeof(int)});
+ return new InstanceDescriptor (ctor, new object[] { size.Width, size.Height });
+ }
+ }
return base.ConvertTo (context, culture, value, destinationType);
}
public override object CreateInstance (ITypeDescriptorContext context,
IDictionary propertyValues)
{
+#if NET_2_0
+ object ow = propertyValues ["Width"];
+ object oh = propertyValues ["Height"];
+ if ((ow == null) || (oh == null))
+ throw new ArgumentException ("propertyValues");
+
+ int width = (int) ow;
+ int height = (int) oh;
+#else
int width = (int) propertyValues ["Width"];
int height = (int) propertyValues ["Height"];
-
+#endif
return new Size (width, height);
}
return true;
}
- [MonoTODO]
public override PropertyDescriptorCollection GetProperties (
ITypeDescriptorContext context,
object value, Attribute[] attributes)
{
- throw new NotImplementedException ();
+ if (value is Size)
+ return TypeDescriptor.GetProperties (value, attributes);
+
+ return base.GetProperties (context, value, attributes);
}
public override bool GetPropertiesSupported (ITypeDescriptorContext context)