diff --git a/Source/OpenTK/Minimal.cs b/Source/OpenTK/Minimal.cs index af7b9b1e..a3751c51 100644 --- a/Source/OpenTK/Minimal.cs +++ b/Source/OpenTK/Minimal.cs @@ -2175,23 +2175,28 @@ namespace OpenTK #endregion } -#region Graphics - -sealed class Graphics : IDisposable +// Need a different namespace to avoid clash with OpenTK.Graphics. +namespace OpenTK.Minimal { - public static Graphics FromImage(OpenTK.Image img) + #region Graphics + + sealed class Graphics : IDisposable { - return new Graphics(); + public static Graphics FromImage(OpenTK.Image img) + { + return new Graphics(); + } + + public void Dispose() + { } + + internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4) + { + } } - public void Dispose() - { } - - internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4) - { - } + #endregion } -#endregion #endif diff --git a/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs b/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs index 8dab99c8..de5ff7cd 100644 --- a/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs +++ b/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs @@ -755,7 +755,7 @@ namespace OpenTK.Platform.MacOS bitmap = new Bitmap(128, 128); #if MINIMAL - using (global::Graphics g = global::Graphics.FromImage(bitmap)) + using (OpenTK.Minimal.Graphics g = OpenTK.Minimal.Graphics.FromImage(bitmap)) #else using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap)) #endif