From 8f27150239385767cb8978371737b4e8b5c38ae3 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Tue, 21 Aug 2007 09:34:05 +0000 Subject: [PATCH] Fixed CLS-Compliance. --- Source/OpenTK/Platform/X11/API.cs | 1 + Source/OpenTK/Platform/X11/Functions.cs | 38 ++++++++++++++++--------- Source/OpenTK/Platform/X11/Structs.cs | 5 ++-- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Source/OpenTK/Platform/X11/API.cs b/Source/OpenTK/Platform/X11/API.cs index aa640dd3..87f976da 100644 --- a/Source/OpenTK/Platform/X11/API.cs +++ b/Source/OpenTK/Platform/X11/API.cs @@ -717,6 +717,7 @@ XF86VidModeGetGammaRampSize( /// /// Defines LATIN-1 and miscellaneous keys. /// + [CLSCompliant(false)] public enum XKey { /* diff --git a/Source/OpenTK/Platform/X11/Functions.cs b/Source/OpenTK/Platform/X11/Functions.cs index 32c31ad8..18998e53 100644 --- a/Source/OpenTK/Platform/X11/Functions.cs +++ b/Source/OpenTK/Platform/X11/Functions.cs @@ -14,10 +14,16 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XSynchronize")] public extern static IntPtr XSynchronize(IntPtr display, bool onoff); - [DllImport("libX11", EntryPoint = "XCreateWindow")] + [DllImport("libX11", EntryPoint = "XCreateWindow"), CLSCompliant(false)] public extern static IntPtr XCreateWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, int depth, int xclass, IntPtr visual, UIntPtr valuemask, ref XSetWindowAttributes attributes); - [DllImport("libX11", EntryPoint = "XCreateSimpleWindow")] + [DllImport("libX11", EntryPoint = "XCreateWindow")] + public extern static IntPtr XCreateWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, int depth, int xclass, IntPtr visual, IntPtr valuemask, ref XSetWindowAttributes attributes); + + [DllImport("libX11", EntryPoint = "XCreateSimpleWindow"), CLSCompliant(false)] public extern static IntPtr XCreateSimpleWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, UIntPtr border, UIntPtr background); + [DllImport("libX11", EntryPoint = "XCreateSimpleWindow")] + public extern static IntPtr XCreateSimpleWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, IntPtr border, IntPtr background); + [DllImport("libX11", EntryPoint = "XMapWindow")] public extern static int XMapWindow(IntPtr display, IntPtr window); [DllImport("libX11", EntryPoint = "XUnmapWindow")] @@ -75,10 +81,10 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XRaiseWindow")] public extern static int XRaiseWindow(IntPtr display, IntPtr window); - [DllImport("libX11", EntryPoint = "XLowerWindow")] + [DllImport("libX11", EntryPoint = "XLowerWindow"), CLSCompliant(false)] public extern static uint XLowerWindow(IntPtr display, IntPtr window); - [DllImport("libX11", EntryPoint = "XConfigureWindow")] + [DllImport("libX11", EntryPoint = "XConfigureWindow"), CLSCompliant(false)] public extern static uint XConfigureWindow(IntPtr display, IntPtr window, ChangeWindowFlags value_mask, ref XWindowChanges values); [DllImport("libX11", EntryPoint = "XInternAtom")] @@ -114,7 +120,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XGetGeometry")] public extern static bool XGetGeometry(IntPtr display, IntPtr window, IntPtr root, IntPtr x, IntPtr y, out int width, out int height, IntPtr border_width, IntPtr depth); - [DllImport("libX11", EntryPoint = "XWarpPointer")] + [DllImport("libX11", EntryPoint = "XWarpPointer"), CLSCompliant(false)] public extern static uint XWarpPointer(IntPtr display, IntPtr src_w, IntPtr dest_w, int src_x, int src_y, uint src_width, uint src_height, int dest_x, int dest_y); [DllImport("libX11", EntryPoint = "XClearWindow")] @@ -133,7 +139,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XDefaultVisual")] public extern static IntPtr XDefaultVisual(IntPtr display, int screen_number); - [DllImport("libX11", EntryPoint = "XDefaultDepth")] + [DllImport("libX11", EntryPoint = "XDefaultDepth"), CLSCompliant(false)] public extern static uint XDefaultDepth(IntPtr display, int screen_number); [DllImport("libX11", EntryPoint = "XDefaultScreen")] @@ -142,10 +148,10 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XDefaultColormap")] public extern static IntPtr XDefaultColormap(IntPtr display, int screen_number); - [DllImport("libX11", EntryPoint = "XLookupColor")] + [DllImport("libX11", EntryPoint = "XLookupColor"), CLSCompliant(false)] public extern static int XLookupColor(IntPtr display, IntPtr Colormap, string Coloranem, ref XColor exact_def_color, ref XColor screen_def_color); - [DllImport("libX11", EntryPoint = "XAllocColor")] + [DllImport("libX11", EntryPoint = "XAllocColor"), CLSCompliant(false)] public extern static int XAllocColor(IntPtr display, IntPtr Colormap, ref XColor colorcell_def); [DllImport("libX11", EntryPoint = "XSetTransientForHint")] @@ -154,13 +160,15 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XChangeProperty")] public extern static int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, PropertyMode mode, ref MotifWmHints data, int nelements); - [DllImport("libX11", EntryPoint = "XChangeProperty")] + [DllImport("libX11", EntryPoint = "XChangeProperty"), CLSCompliant(false)] public extern static int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, PropertyMode mode, ref uint value, int nelements); + [DllImport("libX11", EntryPoint = "XChangeProperty")] + public extern static int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, PropertyMode mode, ref int value, int nelements); [DllImport("libX11", EntryPoint = "XChangeProperty")] public extern static int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, PropertyMode mode, ref IntPtr value, int nelements); - [DllImport("libX11", EntryPoint = "XChangeProperty")] + [DllImport("libX11", EntryPoint = "XChangeProperty"), CLSCompliant(false)] public extern static int XChangeProperty(IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, PropertyMode mode, uint[] data, int nelements); [DllImport("libX11", EntryPoint = "XChangeProperty")] @@ -227,7 +235,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XCreateFontCursor")] public extern static IntPtr XCreateFontCursor(IntPtr display, CursorFontShape shape); - [DllImport("libX11", EntryPoint = "XCreatePixmapCursor")] + [DllImport("libX11", EntryPoint = "XCreatePixmapCursor"), CLSCompliant(false)] public extern static IntPtr XCreatePixmapCursor(IntPtr display, IntPtr source, IntPtr mask, ref XColor foreground_color, ref XColor background_color, int x_hot, int y_hot); [DllImport("libX11", EntryPoint = "XCreatePixmapFromBitmapData")] @@ -293,11 +301,15 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XSetPlaneMask")] public extern static int XSetPlaneMask(IntPtr display, IntPtr gc, IntPtr mask); - [DllImport("libX11", EntryPoint = "XSetForeground")] + [DllImport("libX11", EntryPoint = "XSetForeground"), CLSCompliant(false)] public extern static int XSetForeground(IntPtr display, IntPtr gc, UIntPtr foreground); + [DllImport("libX11", EntryPoint = "XSetForeground")] + public extern static int XSetForeground(IntPtr display, IntPtr gc, IntPtr foreground); - [DllImport("libX11", EntryPoint = "XSetBackground")] + [DllImport("libX11", EntryPoint = "XSetBackground"), CLSCompliant(false)] public extern static int XSetBackground(IntPtr display, IntPtr gc, UIntPtr background); + [DllImport("libX11", EntryPoint = "XSetBackground")] + public extern static int XSetBackground(IntPtr display, IntPtr gc, IntPtr background); [DllImport("libX11", EntryPoint = "XBell")] public extern static int XBell(IntPtr display, int percent); diff --git a/Source/OpenTK/Platform/X11/Structs.cs b/Source/OpenTK/Platform/X11/Structs.cs index d39d92b0..c1764db2 100644 --- a/Source/OpenTK/Platform/X11/Structs.cs +++ b/Source/OpenTK/Platform/X11/Structs.cs @@ -801,6 +801,7 @@ namespace OpenTK.Platform.X11 StaticGravity = 10 } + [CLSCompliant(false)] public enum XKeySym : uint { XK_BackSpace = 0xFF08, @@ -885,7 +886,7 @@ namespace OpenTK.Platform.X11 public IntPtr killid; } - [StructLayout(LayoutKind.Sequential, Pack = 2)] + [StructLayout(LayoutKind.Sequential, Pack = 2), CLSCompliant(false)] public struct XColor { public IntPtr pixel; @@ -1142,7 +1143,7 @@ namespace OpenTK.Platform.X11 Append = 2 } - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential), CLSCompliant(false)] public struct XKeyBoardState { public int key_click_percent;