Merge pull request #297 from ermshiperete/4959

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms.X11Internal / Xlib.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/Xlib.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/Xlib.cs
index bd84be2e3abe13979a2827f61488a4e9b1fc7f40..c8ae33282af19cd2036a8cc15e3a9f80d2096a72 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/Xlib.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/Xlib.cs
@@ -29,7 +29,6 @@ namespace System.Windows.Forms.X11Internal {
 
        internal class Xlib {
                const string libX11 = "X11";
-               const string gdiplus = "gdiplus";
 
                [DllImport (libX11)]
                public extern static IntPtr XOpenDisplay(IntPtr display);
@@ -215,9 +214,6 @@ namespace System.Windows.Forms.X11Internal {
                [DllImport (libX11)]
                public extern static int XDeleteProperty(IntPtr display, IntPtr window, IntPtr property);
 
-               [DllImport (gdiplus)]
-               public extern static bool GetFontMetrics(IntPtr graphicsObject, IntPtr nativeObject, out int ascent, out int descent);
-
                // Drawing
                [DllImport (libX11)]
                public extern static IntPtr XCreateGC(IntPtr display, IntPtr window, IntPtr valuemask, ref XGCValues values);
@@ -228,12 +224,18 @@ namespace System.Windows.Forms.X11Internal {
                [DllImport (libX11)]
                public extern static int XSetFunction(IntPtr display, IntPtr gc, GXFunction function);
 
+               [DllImport (libX11)]
+               internal extern static int XSetLineAttributes(IntPtr display, IntPtr gc, int line_width, GCLineStyle line_style, GCCapStyle cap_style, GCJoinStyle join_style);
+
                [DllImport (libX11)]
                public extern static int XDrawLine(IntPtr display, IntPtr drawable, IntPtr gc, int x1, int y1, int x2, int y2);
 
                [DllImport (libX11)]
                public extern static int XDrawRectangle(IntPtr display, IntPtr drawable, IntPtr gc, int x1, int y1, int width, int height);
 
+               [DllImport (libX11)]
+               public extern static int XFillRectangle(IntPtr display, IntPtr drawable, IntPtr gc, int x1, int y1, int width, int height);
+
                [DllImport (libX11)]
                public extern static int XSetWindowBackground(IntPtr display, IntPtr window, IntPtr background);
 
@@ -267,6 +269,9 @@ namespace System.Windows.Forms.X11Internal {
                [DllImport (libX11)]
                public extern static IntPtr XCreatePixmapFromBitmapData(IntPtr display, IntPtr drawable, byte[] data, int width, int height, IntPtr fg, IntPtr bg, int depth);
 
+               [DllImport (libX11)]
+               public extern static IntPtr XCreatePixmap(IntPtr display, IntPtr d, int width, int height, int depth);
+
                [DllImport (libX11)]
                public extern static IntPtr XFreePixmap(IntPtr display, IntPtr pixmap);