[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Bitmap.cs,1.1,1.2 Colo
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Bitmap.cs,1.1,1.2 ColorConverter.cs,1.2,1.3 Font.cs,1.2,1.3 FontConverter.cs,1.1,1.2 Graphics.cs,1.2,1.3 Image.cs,1.1,1.2 Point.cs,1.1,1.2 PointConverter.cs,1.1,1.2 PointF.cs,1.1,1.2 Rectangle.cs,1.1,1.2 RectangleConverter.cs,1.1,1.2 RectangleF.cs,1.1,1.2 Region.cs,1.1,1.2 Size.cs,1.1,1.2 SizeConverter.cs,1.1,1.2 SizeF.cs,1.1,1.2 StringFormat.cs,1.2,1.3 |
|
Date: |
Mon, 09 Jun 2003 18:15:11 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing
In directory subversions:/tmp/cvs-serv25280/System.Drawing
Modified Files:
Bitmap.cs ColorConverter.cs Font.cs FontConverter.cs
Graphics.cs Image.cs Point.cs PointConverter.cs PointF.cs
Rectangle.cs RectangleConverter.cs RectangleF.cs Region.cs
Size.cs SizeConverter.cs SizeF.cs StringFormat.cs
Log Message:
Various fixes to compile in non-full profiles.
Index: Bitmap.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Bitmap.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Bitmap.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Bitmap.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 29,36 ****
--- 29,40 ----
using System.ComponentModel;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
+ #if CONFIG_COMPONENT_MODEL
[Editor("System.Drawing.Design.BitmapEditor, System.Drawing.Design",
typeof(UITypeEditor))]
+ #endif
public sealed class Bitmap : Image
{
***************
*** 86,91 ****
--- 90,97 ----
// TODO
}
+ #if CONFIG_SERIALIZATION
internal Bitmap(SerializationInfo info, StreamingContext context)
: base(info, context) {}
+ #endif
// Clone this bitmap and transform it into a new pixel format
***************
*** 120,124 ****
--- 126,132 ----
// Convert this bitmap into a native bitmap handle.
+ #if CONFIG_COMPONENT_MODEL
[EditorBrowsable(EditorBrowsableState.Advanced)]
+ #endif
public IntPtr GetHbitmap()
{
***************
*** 126,130 ****
--- 134,140 ----
}
[TODO]
+ #if CONFIG_COMPONENT_MODEL
[EditorBrowsable(EditorBrowsableState.Advanced)]
+ #endif
public IntPtr GetHbitmap(Color background)
{
***************
*** 135,139 ****
--- 145,151 ----
// Convert this bitmap into a native icon handle.
[TODO]
+ #if CONFIG_COMPONENT_MODEL
[EditorBrowsable(EditorBrowsableState.Advanced)]
+ #endif
public IntPtr GetHicon()
{
Index: ColorConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/ColorConverter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ColorConverter.cs 9 Jun 2003 21:25:37 -0000 1.2
--- ColorConverter.cs 9 Jun 2003 22:15:09 -0000 1.3
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
***************
*** 51,54 ****
--- 53,57 ----
(ITypeDescriptorContext context, Type
destinationType)
{
+ #if CONFIG_COMPONENT_MODEL_DESIGN
if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 56,59 ****
--- 59,63 ----
}
else
+ #endif
{
return base.CanConvertTo(context,
destinationType);
***************
*** 233,236 ****
--- 237,241 ----
}
}
+ #if CONFIG_COMPONENT_MODEL_DESIGN
else if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 238,241 ****
--- 243,247 ----
return null;
}
+ #endif
else
{
***************
*** 262,265 ****
--- 268,273 ----
}; // class ColorConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing
Index: Font.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Font.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Font.cs 9 Jun 2003 21:25:37 -0000 1.2
--- Font.cs 9 Jun 2003 22:15:09 -0000 1.3
***************
*** 34,41 ****
[TypeConverter(typeof(FontConverter))]
#endif
[Serializable]
[ComVisible(true)]
! public sealed class Font : MarshalByRefObject, ISerializable,
! ICloneable, IDisposable
{
// Internal state.
--- 34,46 ----
[TypeConverter(typeof(FontConverter))]
#endif
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
! #endif
! public sealed class Font
! : MarshalByRefObject, ICloneable, IDisposable
! #if CONFIG_SERIALIZATION
! , ISerializable
! #endif
{
// Internal state.
***************
*** 102,105 ****
--- 107,111 ----
this.gdiVerticalFont = gdiVerticalFont;
}
+ #if CONFIG_SERIALIZATION
internal Font(SerializationInfo info, StreamingContext context)
{
***************
*** 117,120 ****
--- 123,127 ----
gdiVerticalFont = false;
}
+ #endif
private Font(IToolkitFont font)
{
***************
*** 178,182 ****
--- 185,193 ----
get
{
+ #if CONFIG_EXTENDED_NUMERICS
return (int)(Math.Ceiling(GetHeight()));
+ #else
+ return (int)(GetHeight() + 0.99f);
+ #endif
}
}
***************
*** 529,533 ****
--- 540,548 ----
builder.Append(Name);
builder.Append(" Size=");
+ #if CONFIG_EXTENDED_NUMERICS
builder.Append(Size);
+ #else
+ builder.Append((int)Size);
+ #endif
builder.Append(" Units=");
builder.Append((int)Unit);
***************
*** 540,543 ****
--- 555,560 ----
}
+ #if CONFIG_SERIALIZATION
+
// Get the serialization information for this object.
void ISerializable.GetObjectData(SerializationInfo info,
***************
*** 553,556 ****
--- 570,575 ----
info.AddValue("Unit", Unit);
}
+
+ #endif
// Get the toolkit version of this font for a specific toolkit.
Index: FontConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/FontConverter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FontConverter.cs 7 Jun 2003 22:40:57 -0000 1.1
--- FontConverter.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.Globalization;
***************
*** 126,129 ****
--- 128,133 ----
}; // class FontConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing
Index: Graphics.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Graphics.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Graphics.cs 9 Jun 2003 21:25:37 -0000 1.2
--- Graphics.cs 9 Jun 2003 22:15:09 -0000 1.3
***************
*** 28,32 ****
--- 28,34 ----
using System.Drawing.Toolkit;
+ #if !ECMA_COMPAT
[ComVisible(false)]
+ #endif
public sealed class Graphics : MarshalByRefObject, IDisposable
{
***************
*** 2312,2322 ****
--- 2314,2328 ----
// Delegate that is used to handle abort callbacks on "DrawImage".
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(false)]
+ #endif
public delegate bool DrawImageAbort(IntPtr callbackdata);
// Delegate that is used to enumerate metafile contents.
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(false)]
+ #endif
public delegate bool EnumerateMetafileProc
(EmfPlusRecordType recordType, int flags, int dataSize,
Index: Image.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Image.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Image.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Image.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 27,38 ****
using System.Drawing.Imaging;
[Serializable]
[ComVisible(true)]
public abstract class Image
! : MarshalByRefObject, ISerializable, ICloneable, IDisposable
{
// Internal state.
internal int flags;
internal Guid[] frameDimensionsList;
internal int height;
internal float horizontalResolution;
--- 27,46 ----
using System.Drawing.Imaging;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
public abstract class Image
! : MarshalByRefObject, ICloneable, IDisposable
! #if CONFIG_SERIALIZATION
! , ISerializable
! #endif
{
// Internal state.
internal int flags;
+ #if !ECMA_COMPAT
internal Guid[] frameDimensionsList;
+ internal ImageFormat rawFormat;
+ #endif
internal int height;
internal float horizontalResolution;
***************
*** 41,45 ****
internal int[] propertyIdList;
internal PropertyItem[] propertyItems;
- internal ImageFormat rawFormat;
internal float verticalResolution;
internal int width;
--- 49,52 ----
***************
*** 51,54 ****
--- 58,62 ----
// TODO
}
+ #if CONFIG_SERIALIZATION
[TODO]
internal Image(SerializationInfo info, StreamingContext context)
***************
*** 56,59 ****
--- 64,68 ----
// TODO
}
+ #endif
// Destructor.
***************
*** 71,74 ****
--- 80,84 ----
}
}
+ #if !ECMA_COMPAT
public Guid[] FrameDimensionsList
{
***************
*** 78,81 ****
--- 88,92 ----
}
}
+ #endif
public int Height
{
***************
*** 139,142 ****
--- 150,154 ----
}
}
+ #if !ECMA_COMPAT
public ImageFormat RawFormat
{
***************
*** 146,149 ****
--- 158,162 ----
}
}
+ #endif
public Size Size
{
***************
*** 232,235 ****
--- 245,250 ----
}
+ #if !ECMA_COMPAT
+
// Get parameter information for a specific encoder.
[TODO]
***************
*** 248,251 ****
--- 263,276 ----
}
+ // Select a new frame and make it the active one.
+ [TODO]
+ public int SelectActiveFrame(FrameDimension dimension, int frameIndex)
+ {
+ // TODO
+ return frameIndex;
+ }
+
+ #endif
+
// Get the number of bits per pixel in a specific format.
public static int GetPixelFormatSize(PixelFormat pixfmt)
***************
*** 323,328 ****
public void Save(String filename)
{
! Save(filename, RawFormat);
}
[TODO]
public void Save(String filename, ImageFormat format)
--- 348,354 ----
public void Save(String filename)
{
! // TODO
}
+ #if !ECMA_COMPAT
[TODO]
public void Save(String filename, ImageFormat format)
***************
*** 361,372 ****
// TODO
}
!
! // Select a new frame and make it the active one.
! [TODO]
! public int SelectActiveFrame(FrameDimension dimension, int frameIndex)
! {
! // TODO
! return frameIndex;
! }
// Set a property on this image.
--- 387,391 ----
// TODO
}
! #endif
// Set a property on this image.
***************
*** 377,380 ****
--- 396,401 ----
}
+ #if CONFIG_SERIALIZATION
+
// Implement the ISerializable interface.
[TODO]
***************
*** 384,387 ****
--- 405,410 ----
// TODO
}
+
+ #endif
}; // class Image
Index: Point.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Point.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Point.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Point.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 25,31 ****
--- 25,35 ----
using System.ComponentModel;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
+ #if CONFIG_COMPONENT_MODEL
[TypeConverter("System.Drawing.PointConverter")]
+ #endif
public struct Point
{
***************
*** 89,92 ****
--- 93,98 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a PointF object into a Point object using ceiling conversion.
public static Point Ceiling(PointF value)
***************
*** 96,99 ****
--- 102,107 ----
}
+ #endif
+
// Determine if two points are equal.
public override bool Equals(Object obj)
***************
*** 123,126 ****
--- 131,136 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a PointF object into a Point object using rounding
conversion.
public static Point Round(PointF value)
***************
*** 129,132 ****
--- 139,144 ----
(int)(Math.Round(value.Y)));
}
+
+ #endif
// Convert this object into a string.
Index: PointConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/PointConverter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PointConverter.cs 9 Jun 2003 21:25:37 -0000 1.1
--- PointConverter.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
***************
*** 51,54 ****
--- 53,57 ----
(ITypeDescriptorContext context, Type
destinationType)
{
+ #if CONFIG_COMPONENT_MODEL_DESIGN
if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 56,59 ****
--- 59,63 ----
}
else
+ #endif
{
return base.CanConvertTo(context,
destinationType);
***************
*** 104,107 ****
--- 108,112 ----
return String.Format("{0}, {1}",
point.X, point.Y);
}
+ #if CONFIG_COMPONENT_MODEL_DESIGN
else if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 109,112 ****
--- 114,118 ----
return null;
}
+ #endif
else
{
***************
*** 149,152 ****
--- 155,160 ----
}; // class PointConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing
Index: PointF.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/PointF.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PointF.cs 7 Jun 2003 22:40:57 -0000 1.1
--- PointF.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 24,29 ****
--- 24,31 ----
using System.Runtime.InteropServices;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
public struct PointF
{
***************
*** 97,100 ****
--- 99,104 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert this object into a string.
public override String ToString()
***************
*** 102,105 ****
--- 106,111 ----
return "{X=" + x.ToString() + ",Y=" +
y.ToString() + "}";
}
+
+ #endif
// Overloaded operators.
Index: Rectangle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Rectangle.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Rectangle.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Rectangle.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 25,31 ****
--- 25,35 ----
using System.ComponentModel;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
+ #if CONFIG_COMPONENT_MODEL
[TypeConverter("System.Drawing.RectangleConverter")]
+ #endif
public struct Rectangle
{
***************
*** 180,183 ****
--- 184,189 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a RectangleF object into a Rectangle by ceiling conversion.
public static Rectangle Ceiling(RectangleF value)
***************
*** 189,192 ****
--- 195,200 ----
}
+ #endif
+
// Determine if a rectangle contains a point.
public bool Contains(int x, int y)
***************
*** 331,334 ****
--- 339,344 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a RectangleF object into a Rectangle by rounding conversion.
public static Rectangle Round(RectangleF value)
***************
*** 348,351 ****
--- 358,363 ----
",Height=" + height.ToString() + "}";
}
+
+ #endif
// Convert a RectangleF object into a Rectangle by truncating
conversion.
Index: RectangleConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/RectangleConverter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** RectangleConverter.cs 9 Jun 2003 21:25:37 -0000 1.1
--- RectangleConverter.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
***************
*** 51,54 ****
--- 53,57 ----
(ITypeDescriptorContext context, Type
destinationType)
{
+ #if CONFIG_COMPONENT_MODEL_DESIGN
if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 56,59 ****
--- 59,63 ----
}
else
+ #endif
{
return base.CanConvertTo(context,
destinationType);
***************
*** 108,111 ****
--- 112,116 ----
rect.Width, rect.Height);
}
+ #if CONFIG_COMPONENT_MODEL_DESIGN
else if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 113,116 ****
--- 118,122 ----
return null;
}
+ #endif
else
{
***************
*** 155,158 ****
--- 161,166 ----
}; // class RectangleConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing
Index: RectangleF.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/RectangleF.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** RectangleF.cs 7 Jun 2003 22:40:57 -0000 1.1
--- RectangleF.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 22,26 ****
--- 22,28 ----
{
+ #if !ECMA_COMPAT
[Serializable]
+ #endif
public struct RectangleF
{
***************
*** 320,323 ****
--- 322,327 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert this object into a string.
public override String ToString()
***************
*** 328,331 ****
--- 332,337 ----
",Height=" + height.ToString() + "}";
}
+
+ #endif
// Get the union of two rectangles.
Index: Region.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Region.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Region.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Region.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 26,30 ****
--- 26,32 ----
using System.Drawing.Toolkit;
+ #if !ECMA_COMPAT
[ComVisible(false)]
+ #endif
public sealed class Region : MarshalByRefObject, IDisposable
{
Index: Size.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Size.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Size.cs 7 Jun 2003 22:40:57 -0000 1.1
--- Size.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 25,31 ****
--- 25,35 ----
using System.ComponentModel;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
+ #if CONFIG_COMPONENT_MODEL
[TypeConverter("System.Drawing.SizeConverter")]
+ #endif
public struct Size
{
***************
*** 84,87 ****
--- 88,93 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a SizeF object into a Size object using ceiling conversion.
public static Size Ceiling(SizeF value)
***************
*** 91,94 ****
--- 97,102 ----
}
+ #endif
+
// Determine if two sizes are equal.
public override bool Equals(Object obj)
***************
*** 111,114 ****
--- 119,124 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert a SizeF object into a Size object using rounding conversion.
public static Size Round(SizeF value)
***************
*** 117,120 ****
--- 127,132 ----
(int)(Math.Round(value.Height)));
}
+
+ #endif
// Convert this object into a string.
Index: SizeConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/SizeConverter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SizeConverter.cs 9 Jun 2003 21:25:37 -0000 1.1
--- SizeConverter.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
***************
*** 51,54 ****
--- 53,57 ----
(ITypeDescriptorContext context, Type
destinationType)
{
+ #if CONFIG_COMPONENT_MODEL_DESIGN
if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 56,59 ****
--- 59,63 ----
}
else
+ #endif
{
return base.CanConvertTo(context,
destinationType);
***************
*** 104,107 ****
--- 108,112 ----
return String.Format("{0}, {1}",
size.Width, size.Height);
}
+ #if CONFIG_COMPONENT_MODEL_DESIGN
else if(destinationType ==
typeof(InstanceDescriptor))
{
***************
*** 109,112 ****
--- 114,118 ----
return null;
}
+ #endif
else
{
***************
*** 149,152 ****
--- 155,160 ----
}; // class SizeConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing
Index: SizeF.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/SizeF.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SizeF.cs 7 Jun 2003 22:40:57 -0000 1.1
--- SizeF.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 24,29 ****
--- 24,31 ----
using System.Runtime.InteropServices;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(true)]
+ #endif
public struct SizeF
{
***************
*** 119,122 ****
--- 121,126 ----
}
+ #if CONFIG_EXTENDED_NUMERICS
+
// Convert this object into a string.
public override String ToString()
***************
*** 125,128 ****
--- 129,134 ----
", Height=" + height.ToString() +
"}";
}
+
+ #endif
// Overloaded operators.
Index: StringFormat.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/StringFormat.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StringFormat.cs 9 Jun 2003 21:25:37 -0000 1.2
--- StringFormat.cs 9 Jun 2003 22:15:09 -0000 1.3
***************
*** 185,188 ****
--- 185,189 ----
public float[] GetTopStops(out float firstTabOffset)
{
+ #if CONFIG_EXTENDED_NUMERICS
if(this.tabStops == null)
{
***************
*** 190,193 ****
--- 191,195 ----
this.tabStops = new float [] {8.0f};
}
+ #endif
firstTabOffset = this.firstTabOffset;
return this.tabStops;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Bitmap.cs,1.1,1.2 ColorConverter.cs,1.2,1.3 Font.cs,1.2,1.3 FontConverter.cs,1.1,1.2 Graphics.cs,1.2,1.3 Image.cs,1.1,1.2 Point.cs,1.1,1.2 PointConverter.cs,1.1,1.2 PointF.cs,1.1,1.2 Rectangle.cs,1.1,1.2 RectangleConverter.cs,1.1,1.2 RectangleF.cs,1.1,1.2 Region.cs,1.1,1.2 Size.cs,1.1,1.2 SizeConverter.cs,1.1,1.2 SizeF.cs,1.1,1.2 StringFormat.cs,1.2,1.3,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Toolkit ToolkitManager.cs,1.1,1.2
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Printing InvalidPrinterException.cs,1.1,1.2 Margins.cs,1.1,1.2 MarginsConverter.cs,1.1,1.2 PageSettings.cs,1.1,1.2 PrintDocument.cs,1.1,1.2 PrintEventArgs.cs,1.1,1.2 PrinterSettings.cs,1.1,1.2 PrinterUnitConvert.cs,1.2,1.3 PrintingPermission.cs,1.1,1.2PrintingPermissionAttribute.cs,1.1,1.2
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Toolkit ToolkitManager.cs,1.1,1.2
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Printing InvalidPrinterException.cs,1.1,1.2 Margins.cs,1.1,1.2 MarginsConverter.cs,1.1,1.2 PageSettings.cs,1.1,1.2 PrintDocument.cs,1.1,1.2 PrintEventArgs.cs,1.1,1.2 PrinterSettings.cs,1.1,1.2 PrinterUnitConvert.cs,1.2,1.3 PrintingPermission.cs,1.1,1.2PrintingPermissionAttribute.cs,1.1,1.2
- Index(es):