[Dotgnu-pnet-commits] pnetlib/Xsharp Image.cs, 1.4, 1.5 Xlib.cs.in, 1.15, 1.16

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv28929/Xsharp

Modified Files:
        Image.cs Xlib.cs.in 
Log Message:


Remove references to "Imlib" from "Xsharp", because it isn't used any more.


Index: Image.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Image.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Image.cs    2 Oct 2003 01:53:30 -0000       1.4
--- Image.cs    23 Nov 2003 03:37:51 -0000      1.5
***************
*** 270,318 ****
                                        dpy.Unlock();
                                }
-                       #if false
-                               try
-                               {
-                                       // Lock down the display while we do 
this.
-                                       IntPtr display = dpy.Lock();
- 
-                                       // Call "XShmQueryExtension" before 
"Imlib_init".
-                                       // This is a hack to make sure that 
"Xext" is loaded
-                                       // into memory before "Imlib" goes 
looking for it.
-                                       Xlib.XShmQueryExtension(display);
- 
-                                       // Initialize the Imlib library if 
necessary.
-                                       if(dpy.imlibData == IntPtr.Zero)
-                                       {
-                                               dpy.imlibData = 
Xlib.Imlib_init(display);
-                                       }
- 
-                                       // Load the file and convert it into a 
pixmap and mask.
-                                       Xlib.Pixmap pixmap, mask;
-                                       pixmap = Xlib.Pixmap.Zero;
-                                       mask = Xlib.Pixmap.Zero;
-                                       if(Xlib.Imlib_load_file_to_pixmap
-                                                       (dpy.imlibData, 
filename, ref pixmap, ref mask)
-                                                                       == 0)
-                                       {
-                                               throw new 
XInvalidOperationException
-                                                       
(S._("X_InvalidImageFile"));
-                                       }
- 
-                                       // Wrap the returned XID's in 
Pixmap/Bitmap objects.
-                                       this.pixmap = new Pixmap(dpy, screen, 
pixmap);
-                                       if(mask != Xlib.Pixmap.Zero)
-                                       {
-                                               this.mask = new Bitmap(dpy, 
screen, mask);
-                                       }
-                                       else
-                                       {
-                                               this.mask = null;
-                                       }
-                               }
-                               finally
-                               {
-                                       dpy.Unlock();
-                               }
-                       #endif
                        }
  
--- 270,273 ----

Index: Xlib.cs.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Xlib.cs.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Xlib.cs.in  31 Oct 2003 06:44:35 -0000      1.15
--- Xlib.cs.in  23 Nov 2003 03:37:51 -0000      1.16
***************
*** 587,603 ****
                        (IntPtr display, Xlib.Window window);
  
-       // Helper functions from "libImlib.so" for loading images.
- 
-       [DllImport("Imlib")]
-       extern public static IntPtr Imlib_init(IntPtr disp);
- 
-       [DllImport("Imlib")]
-       extern public static @X_int@ Imlib_load_file_to_pixmap
-                       (IntPtr id, String filename, ref Pixmap pixmap,
-                        ref Pixmap mask);
- 
-       [DllImport("Xext")]
-       extern public static Bool XShmQueryExtension(IntPtr display);
- 
        // Helper functions for creating and managing application groups.
  
--- 587,590 ----