[dotgnu-pnet-commits] pnetlib ./ChangeLog Xsharp/Function.cs Xsharp/G...

[Deryk Robosson]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Deryk Robosson <address@hidden> 06/06/01 12:28:18

Modified files:
        .              : ChangeLog 
        Xsharp         : Function.cs Graphics.cs 
        System.Drawing.Xsharp: DrawingXorBrush.cs DrawingPen.cs 
                               DrawingSolidBrush.cs DrawingHatchBrush.cs 
        Xsharp/Types   : XGCValues.cs 

Log message:
        Rename class Function to GCFunction to not confuse it with a reserved 
C# keyword

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/ChangeLog.diff?tr1=1.2411&tr2=1.2412&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/Xsharp/Function.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/Xsharp/Graphics.cs.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingPen.cs.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/Xsharp/Types/XGCValues.cs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: pnetlib/ChangeLog
diff -u pnetlib/ChangeLog:1.2411 pnetlib/ChangeLog:1.2412
--- pnetlib/ChangeLog:1.2411    Thu Jun  1 12:03:49 2006
+++ pnetlib/ChangeLog   Thu Jun  1 12:28:18 2006
@@ -20,6 +20,16 @@
        System.Drawing/PointConverter.cs, System.Drawing/ColorConverter.cs:
        Test for empty strings using string length.
 
+       * Xsharp/Function.cs: Rename class to GCFunction to not confuse it
+       with a reserved C# keyword.
+
+       * System.Drawing.Xsharp/DrawingXorBrush.cs,
+       System.Drawing.Xsharp/DrawingPen.cs,
+       System.Drawing.Xsharp/DrawingSolidBrush.cs,
+       System.Drawing.Xsharp/DrawingHatchBrush.cs,
+       Xsharp/Types/XGCValues.cs, Xsharp/Graphics.cs,
+       Xsharp/Types/GCValueMask.cs: Alterations per class rename above.
+
 2006-05-30  Deryk Robosson <address@hidden>
 
        * System.Drawing.Win32/Win32.cs: Add MarshalAs attributes for return
Index: pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs
diff -u pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs:1.6 
pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs:1.7
--- pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs:1.6      Tue Dec 23 
22:07:07 2003
+++ pnetlib/System.Drawing.Xsharp/DrawingHatchBrush.cs  Thu Jun  1 12:28:18 2006
@@ -57,7 +57,7 @@
                                        {
                                                bitmap = GetBitmap(style);
                                        }
-                                       g.Function = Function.GXcopy;
+                                       g.Function = GCFunction.GXcopy;
                                        g.SubwindowMode = 
SubwindowMode.ClipByChildren;
                                        if(bitmap != null)
                                        {
Index: pnetlib/System.Drawing.Xsharp/DrawingPen.cs
diff -u pnetlib/System.Drawing.Xsharp/DrawingPen.cs:1.11 
pnetlib/System.Drawing.Xsharp/DrawingPen.cs:1.12
--- pnetlib/System.Drawing.Xsharp/DrawingPen.cs:1.11    Wed Feb 22 06:13:25 2006
+++ pnetlib/System.Drawing.Xsharp/DrawingPen.cs Thu Jun  1 12:28:18 2006
@@ -156,7 +156,7 @@
                                                        break;
                                                }
                                        }
-                                       g.Function = Function.GXcopy;
+                                       g.Function = GCFunction.GXcopy;
                                        g.SubwindowMode = 
SubwindowMode.ClipByChildren;
                                        g.LineWidth = width;
                                        g.LineStyle = style;
Index: pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs
diff -u pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs:1.5 
pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs:1.6
--- pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs:1.5      Sat May 22 
00:24:48 2004
+++ pnetlib/System.Drawing.Xsharp/DrawingSolidBrush.cs  Thu Jun  1 12:28:18 2006
@@ -42,7 +42,7 @@
                                if(graphics != null)
                                {
                                        Xsharp.Graphics g = graphics.graphics;
-                                       g.Function = Function.GXcopy;
+                                       g.Function = GCFunction.GXcopy;
                                        g.SubwindowMode = 
SubwindowMode.ClipByChildren;
                                        g.SetFillSolid();
                                        g.Foreground = 
DrawingToolkit.DrawingToXColor(Color);
Index: pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs
diff -u pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs:1.1 
pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs:1.2
--- pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs:1.1        Tue Dec 23 
22:07:07 2003
+++ pnetlib/System.Drawing.Xsharp/DrawingXorBrush.cs    Thu Jun  1 12:28:18 2006
@@ -47,7 +47,7 @@
                                if(graphics != null)
                                {
                                        Xsharp.Graphics g = graphics.graphics;
-                                       g.Function = Function.GXxor;
+                                       g.Function = GCFunction.GXxor;
                                        g.SubwindowMode = 
SubwindowMode.IncludeInferiors;
                                }
                                graphics.Brush = this;
Index: pnetlib/Xsharp/Function.cs
diff -u pnetlib/Xsharp/Function.cs:1.1 pnetlib/Xsharp/Function.cs:1.2
--- pnetlib/Xsharp/Function.cs:1.1      Wed May 28 04:17:53 2003
+++ pnetlib/Xsharp/Function.cs  Thu Jun  1 12:28:18 2006
@@ -24,12 +24,12 @@
 using System;
 
 /// <summary>
-/// <para>The <see cref="T:Xsharp.Function"/> enumeration specifies
+/// <para>The <see cref="T:Xsharp.GCFunction"/> enumeration specifies
 /// the function mode for graphics objects
 /// (<see cref="T:Xsharp.Graphics"/>).
 /// </para>
 /// </summary>
-public enum Function
+public enum GCFunction
 {
 
        GXclear                 = 0x0,          /* 0 */
Index: pnetlib/Xsharp/Graphics.cs
diff -u pnetlib/Xsharp/Graphics.cs:1.27 pnetlib/Xsharp/Graphics.cs:1.28
--- pnetlib/Xsharp/Graphics.cs:1.27     Thu May 11 09:36:19 2006
+++ pnetlib/Xsharp/Graphics.cs  Thu Jun  1 12:28:18 2006
@@ -164,7 +164,7 @@
                                                // Reset the cached GC back to 
the default settings.
                                                // Xlib will take care of 
stripping the list down
                                                // to just the changes that 
need to be applied.
-                                               gcValues.function = 
Xsharp.Function.GXcopy;
+                                               gcValues.function = 
Xsharp.GCFunction.GXcopy;
                                                gcValues.plane_mask = 
~((XPixel)0);
                                                gcValues.line_width = 0;
                                                gcValues.line_style = 
Xsharp.LineStyle.LineSolid;
@@ -425,13 +425,13 @@
        /// </summary>
        ///
        /// <value>
-       /// <para>The <see cref="T:Xsharp.Function"/> value for the mode.</para>
+       /// <para>The <see cref="T:Xsharp.GCFunction"/> value for the 
mode.</para>
        /// </value>
        ///
        /// <exception cref="T:Xsharp.XException">
        /// <para>Raised if set to an invalid value.</para>
        /// </exception>
-       public Xsharp.Function Function
+       public Xsharp.GCFunction Function
                        {
                                get
                                {
@@ -451,8 +451,8 @@
                                }
                                set
                                {
-                                       if(value < Xsharp.Function.GXclear ||
-                                          value > Xsharp.Function.GXset)
+                                       if(value < Xsharp.GCFunction.GXclear ||
+                                          value > Xsharp.GCFunction.GXset)
                                        {
                                                throw new XException
                                                        
(String.Format(S._("X_Function"), (int)value));
Index: pnetlib/Xsharp/Types/XGCValues.cs
diff -u pnetlib/Xsharp/Types/XGCValues.cs:1.2 
pnetlib/Xsharp/Types/XGCValues.cs:1.3
--- pnetlib/Xsharp/Types/XGCValues.cs:1.2       Wed Feb  4 07:27:07 2004
+++ pnetlib/Xsharp/Types/XGCValues.cs   Thu Jun  1 12:28:18 2006
@@ -56,8 +56,8 @@
        public sbyte            dashes;
 
        // Convert odd fields into types that are useful.
-       public Function function
-                       { get { return (Function)(int)function__; }
+       public GCFunction function
+                       { get { return (GCFunction)(int)function__; }
                          set { function__ = (Xlib.Xint)(int)value; } }
        public int line_width
                        { get { return (int)line_width__; }