From 8687378509be29bfcef701faa7e575d535f84ef8 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Mon, 6 Jul 2015 11:04:00 +1000 Subject: [PATCH] Simplify AGL class, remove code that was used for GLControl. --- OpenTK/Platform/MacOS/AglContext.cs | 114 +------- OpenTK/Platform/MacOS/CarbonBindings/Agl.cs | 261 ++---------------- .../MacOS/CarbonBindings/CarbonAPI.cs | 6 - OpenTK/Platform/MacOS/CarbonGLNative.cs | 2 +- OpenTK/Platform/MacOS/CarbonWindowInfo.cs | 10 +- 5 files changed, 36 insertions(+), 357 deletions(-) diff --git a/OpenTK/Platform/MacOS/AglContext.cs b/OpenTK/Platform/MacOS/AglContext.cs index d3e5a852f..69fd77ce1 100644 --- a/OpenTK/Platform/MacOS/AglContext.cs +++ b/OpenTK/Platform/MacOS/AglContext.cs @@ -1,11 +1,5 @@ -// -// -// AglContext.cs -// // Created by Erik Ylvisaker on 3/17/08. // Copyright 2008. All rights reserved. -// -// using System; using System.Collections.Generic; @@ -114,11 +108,8 @@ namespace OpenTK.Platform.MacOS // Free the pixel format from memory. Agl.aglDestroyPixelFormat(myAGLPixelFormat); Agl.CheckReturnValue( 0, "aglDestroyPixelFormat" ); - - Debug.Print("IsControl: {0}", carbonWindow.IsControl); SetDrawable(carbonWindow); - SetBufferRect(carbonWindow); Update(carbonWindow); MakeCurrent(carbonWindow); @@ -145,69 +136,16 @@ namespace OpenTK.Platform.MacOS return QuartzDisplayDeviceDriver.HandleTo(window.TargetDisplayDevice); } - - void SetBufferRect(CarbonWindowInfo carbonWindow) - { - if (carbonWindow.IsControl == false) - return; - - System.Windows.Forms.Control ctrl = Control.FromHandle(carbonWindow.WindowRef); - - if (ctrl.TopLevelControl == null) - return; - - Rect rect = API.GetControlBounds(carbonWindow.WindowRef); - System.Windows.Forms.Form frm = (System.Windows.Forms.Form) ctrl.TopLevelControl; - - System.Drawing.Point loc = - frm.PointToClient(ctrl.PointToScreen(System.Drawing.Point.Empty)); - - rect.X = (short)loc.X; - rect.Y = (short)loc.Y; - - Debug.Print("Setting buffer_rect for control."); - Debug.Print("MacOS Coordinate Rect: {0}", rect); - - rect.Y = (short)(ctrl.TopLevelControl.ClientSize.Height - rect.Y - rect.Height); - Debug.Print(" AGL Coordinate Rect: {0}", rect); - - int[] glrect = new int[4]; - - glrect[0] = rect.X; - glrect[1] = rect.Y; - glrect[2] = rect.Width; - glrect[3] = rect.Height; - - byte code = Agl.aglSetInteger(Handle.Handle, Agl.ParameterNames.AGL_BUFFER_RECT, glrect); - Agl.CheckReturnValue( code, "aglSetInteger" ); - - code = Agl.aglEnable(Handle.Handle, Agl.ParameterNames.AGL_BUFFER_RECT); - Agl.CheckReturnValue( code, "aglEnable" ); - } void SetDrawable(CarbonWindowInfo carbonWindow) { - IntPtr windowPort = GetWindowPortForWindowInfo(carbonWindow); + IntPtr windowPort = API.GetWindowPort(carbonWindow.WindowRef); //Debug.Print("Setting drawable for context {0} to window port: {1}", Handle.Handle, windowPort); byte code = Agl.aglSetDrawable(Handle.Handle, windowPort); Agl.CheckReturnValue( code, "aglSetDrawable" ); } - - private static IntPtr GetWindowPortForWindowInfo(CarbonWindowInfo carbonWindow) - { - IntPtr windowPort; - if (carbonWindow.IsControl) - { - IntPtr controlOwner = API.GetControlOwner(carbonWindow.WindowRef); - - windowPort = API.GetWindowPort(controlOwner); - } - else - windowPort = API.GetWindowPort(carbonWindow.WindowRef); - - return windowPort; - } + public override void Update(IWindowInfo window) { CarbonWindowInfo carbonWindow = (CarbonWindowInfo)window; @@ -240,7 +178,6 @@ namespace OpenTK.Platform.MacOS return; SetDrawable(carbonWindow); - SetBufferRect(carbonWindow); Agl.aglUpdateContext(Handle.Handle); } @@ -279,6 +216,7 @@ namespace OpenTK.Platform.MacOS mIsFullscreen = true; } + internal void UnsetFullScreen(CarbonWindowInfo windowInfo) { Debug.Print("Unsetting AGL fullscreen."); @@ -297,49 +235,25 @@ namespace OpenTK.Platform.MacOS #region IGraphicsContext Members - bool firstSwap = false; - public override void SwapBuffers() - { - // this is part of the hack to avoid dropping the first frame when - // using multiple GLControls. - if (firstSwap == false && carbonWindow.IsControl) - { - Debug.WriteLine("--> Resetting drawable. <--"); - firstSwap = true; - SetDrawable(carbonWindow); - Update(carbonWindow); - } - + public override void SwapBuffers() { Agl.aglSwapBuffers(Handle.Handle); Agl.CheckReturnValue( 0, "aglSwapBuffers" ); } - public override void MakeCurrent(IWindowInfo window) - { - byte code = Agl.aglSetCurrentContext(Handle.Handle); + public override void MakeCurrent( IWindowInfo window ) { + byte code = Agl.aglSetCurrentContext( Handle.Handle ); Agl.CheckReturnValue(code, "aglSetCurrentContext" ); } - public override bool IsCurrent - { - get - { - return (Handle.Handle == Agl.aglGetCurrentContext()); - } + public override bool IsCurrent { + get { return Handle.Handle == Agl.aglGetCurrentContext(); } } - public override bool VSync - { - get - { - return mVSync; - } - set - { + public override bool VSync { + get { return mVSync; } + set { int intVal = value ? 1 : 0; - Agl.aglSetInteger(Handle.Handle, Agl.ParameterNames.AGL_SWAP_INTERVAL, ref intVal); - mVSync = value; } } @@ -348,13 +262,11 @@ namespace OpenTK.Platform.MacOS #region IDisposable Members - ~AglContext() - { + ~AglContext() { Dispose(false); } - public override void Dispose() - { + public override void Dispose() { Dispose(true); } diff --git a/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs b/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs index 224fc2e70..ac31ff139 100644 --- a/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs +++ b/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs @@ -1,245 +1,39 @@ -// -// -// Agl.cs -// // Created by Erik Ylvisaker on 3/17/08. // Copyright 2008. All rights reserved. -// -// using System; -using System.Diagnostics; using System.Runtime.InteropServices; using AGLContext = System.IntPtr; using AGLDevice = System.IntPtr; using AGLDrawable = System.IntPtr; using AGLPixelFormat = System.IntPtr; -using GLenum = System.UInt32; -namespace OpenTK.Platform.MacOS -{ - #pragma warning disable 0169 - unsafe static partial class Agl - { - +namespace OpenTK.Platform.MacOS { + + unsafe static partial class Agl { const string agl = "/System/Library/Frameworks/AGL.framework/Versions/Current/AGL"; - /* - ** AGL API version. - */ - const int AGL_VERSION_2_0 = 1; - - /************************************************************************/ - - /* - ** Attribute names for aglChoosePixelFormat and aglDescribePixelFormat. - */ - internal enum PixelFormatAttribute - { + // Attribute names for aglChoosePixelFormat and aglDescribePixelFormat. + internal enum PixelFormatAttribute { AGL_NONE = 0, - AGL_ALL_RENDERERS = 1, /* choose from all available renderers */ - AGL_BUFFER_SIZE = 2, /* depth of the index buffer */ - AGL_LEVEL = 3, /* level in plane stacking */ - AGL_RGBA = 4, /* choose an RGBA format */ - AGL_DOUBLEBUFFER = 5, /* double buffering supported */ - AGL_STEREO = 6, /* stereo buffering supported */ - AGL_AUX_BUFFERS = 7, /* number of aux buffers */ - AGL_RED_SIZE = 8, /* number of red component bits */ - AGL_GREEN_SIZE = 9, /* number of green component bits */ - AGL_BLUE_SIZE = 10, /* number of blue component bits */ - AGL_ALPHA_SIZE = 11, /* number of alpha component bits */ - AGL_DEPTH_SIZE = 12, /* number of depth bits */ - AGL_STENCIL_SIZE = 13, /* number of stencil bits */ - AGL_ACCUM_RED_SIZE = 14, /* number of red accum bits */ - AGL_ACCUM_GREEN_SIZE = 15, /* number of green accum bits */ - AGL_ACCUM_BLUE_SIZE = 16, /* number of blue accum bits */ - AGL_ACCUM_ALPHA_SIZE = 17, /* number of alpha accum bits */ - AGL_PIXEL_SIZE = 50, - AGL_MINIMUM_POLICY = 51, - AGL_MAXIMUM_POLICY = 52, - AGL_OFFSCREEN = 53, + AGL_RGBA = 4, + AGL_DOUBLEBUFFER = 5, + AGL_RED_SIZE = 8, + AGL_GREEN_SIZE = 9, + AGL_BLUE_SIZE = 10, + AGL_ALPHA_SIZE = 11, + AGL_DEPTH_SIZE = 12, + AGL_STENCIL_SIZE = 13, AGL_FULLSCREEN = 54, - AGL_SAMPLE_BUFFERS_ARB = 55, - AGL_SAMPLES_ARB = 56, - AGL_AUX_DEPTH_STENCIL = 57, - AGL_COLOR_FLOAT = 58, - AGL_MULTISAMPLE = 59, - AGL_SUPERSAMPLE = 60, - AGL_SAMPLE_ALPHA = 61, } - /* - ** Extended attributes - */ - internal enum ExtendedAttribute - { - AGL_PIXEL_SIZE = 50, /* frame buffer bits per pixel */ - AGL_MINIMUM_POLICY = 51, /* never choose smaller buffers than requested */ - AGL_MAXIMUM_POLICY = 52, /* choose largest buffers of type requested */ - AGL_OFFSCREEN = 53, /* choose an off-screen capable renderer */ - AGL_FULLSCREEN = 54, /* choose a full-screen capable renderer */ - AGL_SAMPLE_BUFFERS_ARB = 55, /* number of multi sample buffers */ - AGL_SAMPLES_ARB = 56, /* number of samples per multi sample buffer */ - AGL_AUX_DEPTH_STENCIL = 57, /* independent depth and/or stencil buffers for the aux buffer */ - AGL_COLOR_FLOAT = 58, /* color buffers store floating point pixels */ - AGL_MULTISAMPLE = 59, /* choose multisample */ - AGL_SUPERSAMPLE = 60, /* choose supersample */ - AGL_SAMPLE_ALPHA = 61, /* request alpha filtering */ - } - /* - ** Renderer management - */ - internal enum RendererManagement - { - AGL_RENDERER_ID = 70, /* request renderer by ID */ - AGL_SINGLE_RENDERER = 71, /* choose a single renderer for all screens */ - AGL_NO_RECOVERY = 72, /* disable all failure recovery systems */ - AGL_ACCELERATED = 73, /* choose a hardware accelerated renderer */ - AGL_CLOSEST_POLICY = 74, /* choose the closest color buffer to request */ - AGL_ROBUST = 75, /* renderer does not need failure recovery */ - AGL_BACKING_STORE = 76, /* back buffer contents are valid after swap */ - AGL_MP_SAFE = 78, /* renderer is multi-processor safe */ - - AGL_WINDOW = 80, /* can be used to render to a window */ - AGL_MULTISCREEN = 81, /* single window can span multiple screens */ - AGL_VIRTUAL_SCREEN = 82, /* virtual screen number */ - AGL_COMPLIANT = 83, /* renderer is opengl compliant */ - - AGL_PBUFFER = 90, /* can be used to render to a pbuffer */ - AGL_REMOTE_PBUFFER = 91, /* can be used to render offline to a pbuffer */ - } - /* - ** Property names for aglDescribeRenderer - */ - internal enum RendererProperties - { - /* const int AGL_OFFSCREEN = 53 */ - /* const int AGL_FULLSCREEN = 54 */ - /* const int AGL_RENDERER_ID = 70 */ - /* const int AGL_ACCELERATED = 73 */ - /* const int AGL_ROBUST = 75 */ - /* const int AGL_BACKING_STORE = 76 */ - /* const int AGL_MP_SAFE = 78 */ - /* const int AGL_WINDOW = 80 */ - /* const int AGL_MULTISCREEN = 81 */ - /* const int AGL_COMPLIANT = 83 */ - /* const int AGL_PBUFFER = 90 */ - AGL_BUFFER_MODES = 100, - AGL_MIN_LEVEL = 101, - AGL_MAX_LEVEL = 102, - AGL_COLOR_MODES = 103, - AGL_ACCUM_MODES = 104, - AGL_DEPTH_MODES = 105, - AGL_STENCIL_MODES = 106, - AGL_MAX_AUX_BUFFERS = 107, - AGL_VIDEO_MEMORY = 120, - AGL_TEXTURE_MEMORY = 121, - AGL_RENDERER_COUNT = 128, - } - /* - ** Integer parameter names - */ - internal enum ParameterNames - { - AGL_SWAP_RECT = 200, /* Enable or set the swap rectangle */ - AGL_BUFFER_RECT = 202, /* Enable or set the buffer rectangle */ - AGL_SWAP_LIMIT = 203, /* Enable or disable the swap async limit */ - AGL_COLORMAP_TRACKING = 210, /* Enable or disable colormap tracking */ - AGL_COLORMAP_ENTRY = 212, /* Set a colormap entry to {index, r, g, b} */ - AGL_RASTERIZATION = 220, /* Enable or disable all rasterization */ + + // Integer parameter names + internal enum ParameterNames { AGL_SWAP_INTERVAL = 222, /* 0 -> Don't sync, n -> Sync every n retrace */ - AGL_STATE_VALIDATION = 230, /* Validate state for multi-screen functionality */ - AGL_BUFFER_NAME = 231, /* Set the buffer name. Allows for multi ctx to share a buffer */ - AGL_ORDER_CONTEXT_TO_FRONT = 232, /* Order the current context in front of all the other contexts. */ - AGL_CONTEXT_SURFACE_ID = 233, /* aglGetInteger only - returns the ID of the drawable surface for the context */ - AGL_CONTEXT_DISPLAY_ID = 234, /* aglGetInteger only - returns the display ID(s) of all displays touched by the context, up to a maximum of 32 displays */ - AGL_SURFACE_ORDER = 235, /* Position of OpenGL surface relative to window: 1 -> Above window, -1 -> Below Window */ - AGL_SURFACE_OPACITY = 236, /* Opacity of OpenGL surface: 1 -> Surface is opaque (default), 0 -> non-opaque */ - AGL_CLIP_REGION = 254, /* Enable or set the drawable clipping region */ - AGL_FS_CAPTURE_SINGLE = 255, /* Enable the capture of only a single display for aglFullScreen, normally disabled */ - AGL_SURFACE_BACKING_SIZE = 304, /* 2 params. Width/height of surface backing size */ - AGL_ENABLE_SURFACE_BACKING_SIZE = 305, /* Enable or disable surface backing size override */ - AGL_SURFACE_VOLATILE = 306, /* Flag surface to candidate for deletion */ - } - /* - ** Option names for aglConfigure. - */ - internal enum OptionName - { - AGL_FORMAT_CACHE_SIZE = 501, /* Set the size of the pixel format cache */ - AGL_CLEAR_FORMAT_CACHE = 502, /* Reset the pixel format cache */ - AGL_RETAIN_RENDERERS = 503, /* Whether to retain loaded renderers in memory */ - } - /* buffer_modes */ - internal enum BufferModes - { - AGL_MONOSCOPIC_BIT = 0x00000001, - AGL_STEREOSCOPIC_BIT = 0x00000002, - AGL_SINGLEBUFFER_BIT = 0x00000004, - AGL_DOUBLEBUFFER_BIT = 0x00000008, } - internal enum BitDepths - { - /* bit depths */ - AGL_0_BIT = 0x00000001, - AGL_1_BIT = 0x00000002, - AGL_2_BIT = 0x00000004, - AGL_3_BIT = 0x00000008, - AGL_4_BIT = 0x00000010, - AGL_5_BIT = 0x00000020, - AGL_6_BIT = 0x00000040, - AGL_8_BIT = 0x00000080, - AGL_10_BIT = 0x00000100, - AGL_12_BIT = 0x00000200, - AGL_16_BIT = 0x00000400, - AGL_24_BIT = 0x00000800, - AGL_32_BIT = 0x00001000, - AGL_48_BIT = 0x00002000, - AGL_64_BIT = 0x00004000, - AGL_96_BIT = 0x00008000, - AGL_128_BIT = 0x00010000, - } - /* color modes */ - internal enum ColorModes - { - AGL_RGB8_BIT = 0x00000001, /* 8 rgb bit/pixel, RGB=7:0, inverse colormap */ - AGL_RGB8_A8_BIT = 0x00000002, /* 8-8 argb bit/pixel, A=7:0, RGB=7:0, inverse colormap */ - AGL_BGR233_BIT = 0x00000004, /* 8 rgb bit/pixel, B=7:6, G=5:3, R=2:0 */ - AGL_BGR233_A8_BIT = 0x00000008, /* 8-8 argb bit/pixel, A=7:0, B=7:6, G=5:3, R=2:0 */ - AGL_RGB332_BIT = 0x00000010, /* 8 rgb bit/pixel, R=7:5, G=4:2, B=1:0 */ - AGL_RGB332_A8_BIT = 0x00000020, /* 8-8 argb bit/pixel, A=7:0, R=7:5, G=4:2, B=1:0 */ - AGL_RGB444_BIT = 0x00000040, /* 16 rgb bit/pixel, R=11:8, G=7:4, B=3:0 */ - AGL_ARGB4444_BIT = 0x00000080, /* 16 argb bit/pixel, A=15:12, R=11:8, G=7:4, B=3:0 */ - AGL_RGB444_A8_BIT = 0x00000100, /* 8-16 argb bit/pixel, A=7:0, R=11:8, G=7:4, B=3:0 */ - AGL_RGB555_BIT = 0x00000200, /* 16 rgb bit/pixel, R=14:10, G=9:5, B=4:0 */ - AGL_ARGB1555_BIT = 0x00000400, /* 16 argb bit/pixel, A=15, R=14:10, G=9:5, B=4:0 */ - AGL_RGB555_A8_BIT = 0x00000800, /* 8-16 argb bit/pixel, A=7:0, R=14:10, G=9:5, B=4:0 */ - AGL_RGB565_BIT = 0x00001000, /* 16 rgb bit/pixel, R=15:11, G=10:5, B=4:0 */ - AGL_RGB565_A8_BIT = 0x00002000, /* 8-16 argb bit/pixel, A=7:0, R=15:11, G=10:5, B=4:0 */ - AGL_RGB888_BIT = 0x00004000, /* 32 rgb bit/pixel, R=23:16, G=15:8, B=7:0 */ - AGL_ARGB8888_BIT = 0x00008000, /* 32 argb bit/pixel, A=31:24, R=23:16, G=15:8, B=7:0 */ - AGL_RGB888_A8_BIT = 0x00010000, /* 8-32 argb bit/pixel, A=7:0, R=23:16, G=15:8, B=7:0 */ - AGL_RGB101010_BIT = 0x00020000, /* 32 rgb bit/pixel, R=29:20, G=19:10, B=9:0 */ - AGL_ARGB2101010_BIT = 0x00040000, /* 32 argb bit/pixel, A=31:30 R=29:20, G=19:10, B=9:0 */ - AGL_RGB101010_A8_BIT = 0x00080000, /* 8-32 argb bit/pixel, A=7:0 R=29:20, G=19:10, B=9:0 */ - AGL_RGB121212_BIT = 0x00100000, /* 48 rgb bit/pixel, R=35:24, G=23:12, B=11:0 */ - AGL_ARGB12121212_BIT = 0x00200000, /* 48 argb bit/pixel, A=47:36, R=35:24, G=23:12, B=11:0 */ - AGL_RGB161616_BIT = 0x00400000, /* 64 rgb bit/pixel, R=47:32, G=31:16, B=15:0 */ - AGL_ARGB16161616_BIT = 0x00800000, /* 64 argb bit/pixel, A=63:48, R=47:32, G=31:16, B=15:0 */ - AGL_INDEX8_BIT = 0x20000000, /* 8 bit color look up table (deprecated) */ - AGL_INDEX16_BIT = 0x40000000, /* 16 bit color look up table (deprecated) */ - AGL_RGBFLOAT64_BIT = 0x01000000, /* 64 rgb bit/pixel, half float */ - AGL_RGBAFLOAT64_BIT = 0x02000000, /* 64 argb bit/pixel, half float */ - AGL_RGBFLOAT128_BIT = 0x04000000, /* 128 rgb bit/pixel, ieee float */ - AGL_RGBAFLOAT128_BIT = 0x08000000, /* 128 argb bit/pixel, ieee float */ - AGL_RGBFLOAT256_BIT = 0x10000000, /* 256 rgb bit/pixel, ieee double */ - AGL_RGBAFLOAT256_BIT = 0x20000000, /* 256 argb bit/pixel, ieee double */ - } - /* - ** Error return values from aglGetError. - */ - internal enum AglError - { + // Error return values from aglGetError. + internal enum AglError { NoError = 0, /* no error */ BadAttribute = 10000, /* invalid pixel format attribute */ @@ -261,11 +55,10 @@ namespace OpenTK.Platform.MacOS BadAlloc = 10016, /* memory allocation failure */ BadConnection = 10017, /* invalid CoreGraphics connection */ } - /************************************************************************/ // Pixel format functions - [DllImport(agl)] internal static extern AGLPixelFormat aglChoosePixelFormat(ref AGLDevice gdevs, int ndev, int []attribs); - [DllImport(agl)] internal static extern AGLPixelFormat aglChoosePixelFormat(IntPtr gdevs, int ndev, int []attribs); + [DllImport(agl)] internal static extern AGLPixelFormat aglChoosePixelFormat(ref AGLDevice gdevs, int ndev, int[] attribs); + [DllImport(agl)] internal static extern AGLPixelFormat aglChoosePixelFormat(IntPtr gdevs, int ndev, int[] attribs); [DllImport(agl)] internal static extern void aglDestroyPixelFormat(AGLPixelFormat pix); // Context functions @@ -281,29 +74,17 @@ namespace OpenTK.Platform.MacOS // Drawable Functions [DllImport(agl)] internal static extern byte aglSetDrawable(AGLContext ctx, AGLDrawable draw); - [DllImport(agl)] internal static extern byte aglSetFullScreen(AGLContext ctx, int width, int height, int freq, int device); // Virtual screen functions [DllImport(agl)] static extern byte aglSetVirtualScreen(AGLContext ctx, int screen); [DllImport(agl)] static extern int aglGetVirtualScreen(AGLContext ctx); - // Obtain version numbers - [DllImport(agl)] static extern void aglGetVersion(int *major, int *minor); - - // Global library options - [DllImport(agl)] internal static extern byte aglConfigure(GLenum pname, uint param); - // Swap functions [DllImport(agl)] internal static extern void aglSwapBuffers(AGLContext ctx); // Per context options - [DllImport(agl)] internal static extern byte aglEnable(AGLContext ctx, ParameterNames pname); - [DllImport(agl)] internal static extern byte aglDisable(AGLContext ctx, ParameterNames pname); - [DllImport(agl)] internal static extern byte aglIsEnabled(AGLContext ctx, GLenum pname); [DllImport(agl)] internal static extern byte aglSetInteger(AGLContext ctx, ParameterNames pname, ref int @params); - [DllImport(agl)] internal static extern byte aglSetInteger(AGLContext ctx, ParameterNames pname, int []@params); - [DllImport(agl)] internal static extern byte aglGetInteger(AGLContext ctx, GLenum pname, int* @params); // Error functions [DllImport(agl)] internal static extern AglError aglGetError(); @@ -319,7 +100,5 @@ namespace OpenTK.Platform.MacOS "AGL Error from function {0}: {1} {2}", function, errCode, error) ); } - - #pragma warning restore 0169 } } diff --git a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs index f7672c9e8..6771e2342 100644 --- a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs +++ b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs @@ -1,11 +1,5 @@ -// -// -// Carbon.cs -// // Created by Erik Ylvisaker on 3/17/08. // Copyright 2008. All rights reserved. -// -// using System; using System.Runtime.InteropServices; diff --git a/OpenTK/Platform/MacOS/CarbonGLNative.cs b/OpenTK/Platform/MacOS/CarbonGLNative.cs index d1bc0ccf0..29e553f49 100644 --- a/OpenTK/Platform/MacOS/CarbonGLNative.cs +++ b/OpenTK/Platform/MacOS/CarbonGLNative.cs @@ -172,7 +172,7 @@ namespace OpenTK.Platform.MacOS IntPtr windowRef = API.CreateNewWindow(@class, attrib, r); API.SetWindowTitle(windowRef, title); - window = new CarbonWindowInfo(windowRef, true, false); + window = new CarbonWindowInfo(windowRef, true); SetLocation(r.X, r.Y); SetSize(r.Width, r.Height); diff --git a/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/OpenTK/Platform/MacOS/CarbonWindowInfo.cs index 61449e67f..cb5d57bab 100644 --- a/OpenTK/Platform/MacOS/CarbonWindowInfo.cs +++ b/OpenTK/Platform/MacOS/CarbonWindowInfo.cs @@ -41,7 +41,6 @@ namespace OpenTK.Platform.MacOS IntPtr windowRef; bool ownHandle = false; bool disposed = false; - bool isControl = false; bool goFullScreenHack = false; bool goWindowedHack = false; @@ -52,12 +51,10 @@ namespace OpenTK.Platform.MacOS /// /// A valid Carbon window reference. /// - /// - public CarbonWindowInfo(IntPtr windowRef, bool ownHandle, bool isControl) + public CarbonWindowInfo(IntPtr windowRef, bool ownHandle) { this.windowRef = windowRef; this.ownHandle = ownHandle; - this.isControl = isControl; } #endregion @@ -87,10 +84,7 @@ namespace OpenTK.Platform.MacOS /// /// Gets a value indicating whether this instance refers to a System.Windows.Forms.Control. /// - public bool IsControl - { - get { return isControl; } - } + public const bool IsControl = false; /// Returns a System.String that represents the current window. /// A System.String that represents the current window.