Avoid using the global namespace in the MINIMAL configuration, as it confuses the Mono compiler.

This commit is contained in:
the_fiddler 2011-12-08 00:10:03 +00:00
parent 4fde3c4dab
commit 41e0c65dcb
2 changed files with 18 additions and 13 deletions

View file

@ -2175,6 +2175,9 @@ namespace OpenTK
#endregion #endregion
} }
// Need a different namespace to avoid clash with OpenTK.Graphics.
namespace OpenTK.Minimal
{
#region Graphics #region Graphics
sealed class Graphics : IDisposable sealed class Graphics : IDisposable
@ -2193,5 +2196,7 @@ sealed class Graphics : IDisposable
} }
#endregion #endregion
}
#endif #endif

View file

@ -755,7 +755,7 @@ namespace OpenTK.Platform.MacOS
bitmap = new Bitmap(128, 128); bitmap = new Bitmap(128, 128);
#if MINIMAL #if MINIMAL
using (global::Graphics g = global::Graphics.FromImage(bitmap)) using (OpenTK.Minimal.Graphics g = OpenTK.Minimal.Graphics.FromImage(bitmap))
#else #else
using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap)) using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
#endif #endif