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 7bcbfc7072
commit e8590dddd4
2 changed files with 18 additions and 13 deletions

View file

@ -2175,23 +2175,28 @@ namespace OpenTK
#endregion #endregion
} }
#region Graphics // Need a different namespace to avoid clash with OpenTK.Graphics.
namespace OpenTK.Minimal
sealed class Graphics : IDisposable
{ {
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() #endregion
{ }
internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4)
{
}
} }
#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