[Dotgnu-libs-commits] CVS: xsharp/Xsharp/XWindows Canvas.cs,1.2,1.3 IconData.cs,1.1.1.1,1.2 InputOutputWidget.cs,1.3,1.4 Region.cs,1.2,1.3 Widget.cs,1.1.1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows
In directory subversions:/tmp/cvs-serv22671/Xsharp/XWindows

Modified Files:
        Canvas.cs IconData.cs InputOutputWidget.cs Region.cs Widget.cs 
Log Message:


Small modifications to compile with csc.


Index: Canvas.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows/Canvas.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Canvas.cs   27 Sep 2002 12:56:48 -0000      1.2
--- Canvas.cs   28 Sep 2002 01:06:52 -0000      1.3
***************
*** 149,153 ****
                                                // to just the changes that 
need to be applied.
                                                gcValues.function = 
XWindows.Function.GXcopy;
!                                               gcValues.plane_mask = 
(Xlib.Pixel)(~((ulong)0));
                                                gcValues.line_width = 0;
                                                gcValues.line_style = 
XWindows.LineStyle.LineSolid;
--- 149,153 ----
                                                // to just the changes that 
need to be applied.
                                                gcValues.function = 
XWindows.Function.GXcopy;
!                                               gcValues.plane_mask = 
~((Xlib.Pixel)0);
                                                gcValues.line_width = 0;
                                                gcValues.line_style = 
XWindows.LineStyle.LineSolid;

Index: IconData.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows/IconData.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IconData.cs 26 Sep 2002 10:32:41 -0000      1.1.1.1
--- IconData.cs 28 Sep 2002 01:06:52 -0000      1.2
***************
*** 145,149 ****
        private void Load(String name, Assembly assembly)
                        {
!                               Stream stream;
  
                                // Get a stream for the icon resource.
--- 145,149 ----
        private void Load(String name, Assembly assembly)
                        {
!                               Stream stream = null;
  
                                // Get a stream for the icon resource.

Index: InputOutputWidget.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows/InputOutputWidget.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** InputOutputWidget.cs        27 Sep 2002 12:56:48 -0000      1.3
--- InputOutputWidget.cs        28 Sep 2002 01:06:52 -0000      1.4
***************
*** 469,473 ****
                                                                        out int 
tx, out int ty)
                        {
!                               if(bg.Index == StandardColor.Inherit)
                                {
                                        InputOutputWidget parent =
--- 469,473 ----
                                                                        out int 
tx, out int ty)
                        {
!                               if(background.Index == StandardColor.Inherit)
                                {
                                        InputOutputWidget parent =
***************
*** 488,492 ****
                                        }
                                }
!                               else if(bg.Index == StandardColor.Pixmap)
                                {
                                        bg = background;
--- 488,492 ----
                                        }
                                }
!                               else if(background.Index == 
StandardColor.Pixmap)
                                {
                                        bg = background;

Index: Region.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows/Region.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Region.cs   27 Sep 2002 12:54:59 -0000      1.2
--- Region.cs   28 Sep 2002 01:06:52 -0000      1.3
***************
*** 341,344 ****
--- 341,360 ----
  
        /// <summary>
+       /// <para>Get the hash code for a region.</para>
+       /// </summary>
+       ///
+       /// <returns>
+       /// <para>Returns the hash code.</para>
+       /// </returns>
+       public override int GetHashCode()
+                       {
+                               lock(typeof(Region))
+                               {
+                                       // TODO
+                                       return 0;
+                               }
+                       }
+ 
+       /// <summary>
        /// <para>Union a rectangle with this region.</para>
        /// </summary>

Index: Widget.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/xsharp/Xsharp/XWindows/Widget.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Widget.cs   26 Sep 2002 10:32:44 -0000      1.1.1.1
--- Widget.cs   28 Sep 2002 01:06:52 -0000      1.2
***************
*** 562,566 ****
                                {
                                        IntPtr display = dpy.Lock();
!                                       XWindowChanges changes;
                                        changes.sibling = 
child.GetWidgetHandle();
                                        changes.stack_mode = 1;         /* 
Below */
--- 562,566 ----
                                {
                                        IntPtr display = dpy.Lock();
!                                       XWindowChanges changes = new 
XWindowChanges();
                                        changes.sibling = 
child.GetWidgetHandle();
                                        changes.stack_mode = 1;         /* 
Below */
***************
*** 583,587 ****
                                {
                                        IntPtr display = dpy.Lock();
!                                       XWindowChanges changes;
                                        changes.sibling = 
child.GetWidgetHandle();
                                        changes.stack_mode = 0;         /* 
Above */
--- 583,587 ----
                                {
                                        IntPtr display = dpy.Lock();
!                                       XWindowChanges changes = new 
XWindowChanges();
                                        changes.sibling = 
child.GetWidgetHandle();
                                        changes.stack_mode = 0;         /* 
Above */