diff --git a/Source/OpenTK/Graphics/Glu/GluCore.cs b/Source/OpenTK/Graphics/Glu/GluCore.cs index c310b746..ed86799e 100644 --- a/Source/OpenTK/Graphics/Glu/GluCore.cs +++ b/Source/OpenTK/Graphics/Glu/GluCore.cs @@ -7,7 +7,7 @@ namespace OpenTK.Graphics partial class Glu { - [Obsolete] + [Obsolete] internal static partial class Imports { diff --git a/Source/OpenTK/Graphics/Glu/GluHelper.cs b/Source/OpenTK/Graphics/Glu/GluHelper.cs index 6e221ac1..b28ca596 100644 --- a/Source/OpenTK/Graphics/Glu/GluHelper.cs +++ b/Source/OpenTK/Graphics/Glu/GluHelper.cs @@ -294,7 +294,7 @@ namespace OpenTK.Graphics /// string Filter = "FirstName = 'Ton'" /// MethodInfo mi = typeof(Person).GetMethod("GetAll"); /// snoei.net.Reflection.FastInvoker.FastInvokeHandler fi = snoei.net.Reflection.FastInvoker.GetMethodInvoker( mi ); - /// return fi.Invoke( Person, new object[]{Filter} ); + // return fi.Invoke( Person, new object[]{Filter} ); /// //Calls Person.GetAll(string Filter); /// /// diff --git a/Source/OpenTK/Platform/MacOS/AglContext.cs b/Source/OpenTK/Platform/MacOS/AglContext.cs index 7403155a..8802a753 100644 --- a/Source/OpenTK/Platform/MacOS/AglContext.cs +++ b/Source/OpenTK/Platform/MacOS/AglContext.cs @@ -92,12 +92,12 @@ namespace OpenTK.Platform.MacOS AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_ACCUM_BLUE_SIZE, mode.AccumulatorFormat.Blue); AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_ACCUM_ALPHA_SIZE, mode.AccumulatorFormat.Alpha); } - - if (mode.Samples > 0) - { - AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_SAMPLE_BUFFERS_ARB, 1); - AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_SAMPLES_ARB, mode.Samples); - } + + if (mode.Samples > 0) + { + AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_SAMPLE_BUFFERS_ARB, 1); + AddPixelAttrib(aglAttributes, Agl.PixelFormatAttribute.AGL_SAMPLES_ARB, mode.Samples); + } if (fullscreen) { diff --git a/Source/OpenTK/Platform/MacOS/Application.cs b/Source/OpenTK/Platform/MacOS/Application.cs index 7ba1054b..ba2ccdc4 100644 --- a/Source/OpenTK/Platform/MacOS/Application.cs +++ b/Source/OpenTK/Platform/MacOS/Application.cs @@ -15,8 +15,8 @@ using System.Text; namespace OpenTK.Platform.MacOS.Carbon { - static class Application - { + static class Application + { static bool mInitialized = false; static IntPtr uppHandler; static CarbonGLNative eventHandler; @@ -30,7 +30,7 @@ namespace OpenTK.Platform.MacOS.Carbon internal static void Initialize() { if (mInitialized) return; - + API.AcquireRootMenu(); ConnectEvents(); @@ -124,7 +124,7 @@ namespace OpenTK.Platform.MacOS.Carbon static void MainWindowClosed(object sender, EventArgs e) { - Debug.Print("Quitting application event loop."); + Debug.Print("Quitting application event loop."); API.QuitApplicationEventLoop(); } diff --git a/Source/OpenTK/Platform/MacOS/CarbonGLControl.cs b/Source/OpenTK/Platform/MacOS/CarbonGLControl.cs index 39c1a457..0cab6c37 100644 --- a/Source/OpenTK/Platform/MacOS/CarbonGLControl.cs +++ b/Source/OpenTK/Platform/MacOS/CarbonGLControl.cs @@ -25,14 +25,14 @@ namespace OpenTK.Platform.MacOS return new GraphicsContext(mode, WindowInfo, major, minor, flags); } - // TODO: Fix this - bool lastIsIdle = false; + // TODO: Fix this + bool lastIsIdle = false; public bool IsIdle { get { - lastIsIdle = !lastIsIdle; - return lastIsIdle; + lastIsIdle = !lastIsIdle; + return lastIsIdle; } } diff --git a/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs index 59db2c1a..b7f17cc2 100644 --- a/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs +++ b/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs @@ -60,7 +60,7 @@ namespace OpenTK.Platform.MacOS if (ownHandle) { - Debug.Print("Disposing window {0}.", windowRef); + Debug.Print("Disposing window {0}.", windowRef); Carbon.API.DisposeWindow(this.windowRef); windowRef = IntPtr.Zero; } diff --git a/Source/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs b/Source/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs index a77f3a47..88db9dbe 100644 --- a/Source/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs +++ b/Source/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs @@ -59,7 +59,7 @@ namespace OpenTK.Platform.MacOS int currentHeight = CG.DisplayPixelsHigh(currentDisplay); Debug.Print("Display {0} is at {1}x{2}", i, currentWidth, currentHeight); - IntPtr displayModesPtr = CG.DisplayAvailableModes(currentDisplay); + IntPtr displayModesPtr = CG.DisplayAvailableModes(currentDisplay); CFArray displayModes = new CFArray(displayModesPtr); Debug.Print("Supports {0} display modes.", displayModes.Count); diff --git a/Source/OpenTK/Platform/Utilities.cs b/Source/OpenTK/Platform/Utilities.cs index e7559f6c..be574440 100644 --- a/Source/OpenTK/Platform/Utilities.cs +++ b/Source/OpenTK/Platform/Utilities.cs @@ -244,7 +244,7 @@ namespace OpenTK.Platform /// A System.Windows.Forms.Control. /// A new IGraphicsContext instance. /// An IWindowInfo instance for the specified cntrl. - [Obsolete("Create the IWindowInfo object first by calling CreateWindowInfo, then use the CreateGraphicsContext overload which takes major, minor and flags parameters.")] + [Obsolete("Create the IWindowInfo object first by calling CreateWindowInfo, then use the CreateGraphicsContext overload which takes major, minor and flags parameters.")] public static void CreateGraphicsContext(Graphics.GraphicsMode mode, Control cntrl, out Graphics.IGraphicsContext context, out IWindowInfo info) { @@ -258,8 +258,8 @@ namespace OpenTK.Platform /// A System.IntPtr that contains the handle for a System.Windows.Forms.Control. /// A new IGraphicsContext instance. /// An IWindowInfo instance for the specified ctrl. - [Obsolete("Create the IWindowInfo object first by calling CreateWindowInfo, then use the CreateGraphicsContext overload which takes major, minor and flags parameters.")] - public static void CreateGraphicsContext(Graphics.GraphicsMode mode, IntPtr cntrlHandle, + [Obsolete("Create the IWindowInfo object first by calling CreateWindowInfo, then use the CreateGraphicsContext overload which takes major, minor and flags parameters.")] + public static void CreateGraphicsContext(Graphics.GraphicsMode mode, IntPtr cntrlHandle, out Graphics.IGraphicsContext context, out IWindowInfo info) { info = CreateWindowInfo(mode, cntrlHandle); diff --git a/Source/OpenTK/Platform/Windows/WglHelper.cs b/Source/OpenTK/Platform/Windows/WglHelper.cs index 2668afb4..69dba398 100644 --- a/Source/OpenTK/Platform/Windows/WglHelper.cs +++ b/Source/OpenTK/Platform/Windows/WglHelper.cs @@ -3,7 +3,7 @@ * See license.txt for license info * * Date: 12/8/2007 - * Time: 6:43 ìì + * Time: 6:43 �� */ #endregion @@ -13,7 +13,7 @@ using System.Reflection; namespace OpenTK.Platform.Windows { - internal partial class Wgl + internal partial class Wgl { #region --- Constructors --- diff --git a/Source/OpenTK/Platform/Windows/WinGLContext.cs b/Source/OpenTK/Platform/Windows/WinGLContext.cs index fcec0509..122f05d4 100644 --- a/Source/OpenTK/Platform/Windows/WinGLContext.cs +++ b/Source/OpenTK/Platform/Windows/WinGLContext.cs @@ -170,8 +170,7 @@ namespace OpenTK.Platform.Windows "Failed to make context {0} current. Error: {1}", this, Marshal.GetLastWin32Error())); } - - #endregion + #endregion #region public bool IsCurrent