Marked platform-specific APIs as internal.

Added ObsoleteAttribute to obsolete functionality.

Source/OpenTK/Platform/Dummy/DummyGLContext.cs

@@ -56,14 +56,18 @@ namespace OpenTK.Platform.Dummy
         public void MakeCurrent(IWindowInfo info) { }
         public bool IsCurrent { get { return true; } set { } }
 
+        [Obsolete]
         public event DestroyEvent<IGraphicsContext> Destroy;
+        [Obsolete]
         void OnDestroy() { if (Destroy != null) Destroy(this, EventArgs.Empty); }
 
+        [Obsolete]
         public void RegisterForDisposal(IDisposable resource)
         {
             throw new NotImplementedException("Use the general GraphicsContext class instead.");
         }
 
+        [Obsolete]
         public void DisposeResources()
         {
             throw new NotImplementedException("Use the general GraphicsContext class instead.");

Source/OpenTK/Platform/INativeGLWindow.cs

@@ -16,9 +16,9 @@ using System.Drawing;
 
 namespace OpenTK.Platform
 {
+    [Obsolete]
     internal interface INativeGLWindow : IDisposable
     {
-        [Obsolete]
         void CreateWindow(int width, int height, GraphicsMode mode, int major, int minor, GraphicsContextFlags flags, out IGraphicsContext context);
         void DestroyWindow();
         void ProcessEvents();
@@ -39,6 +39,8 @@ namespace OpenTK.Platform
         event DestroyEvent Destroy;
     }
 
-    public delegate void CreateEvent(object sender, EventArgs e);
+    [Obsolete]
-    public delegate void DestroyEvent(object sender, EventArgs e);
+    internal delegate void CreateEvent(object sender, EventArgs e);
+    [Obsolete]
+    internal delegate void DestroyEvent(object sender, EventArgs e);
 }

Source/OpenTK/Platform/MacOS/AglContext.cs

@@ -301,7 +301,10 @@ namespace OpenTK.Platform.MacOS
             }
         }
 
+        [Obsolete]
         public event DestroyEvent<IGraphicsContext> Destroy;
+
+        [Obsolete]
         void OnDestroy()
         {
 

Source/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs

@@ -153,7 +153,7 @@ namespace OpenTK.Platform.MacOS.Carbon
         internal uint EventKind;
     }
 
-    public enum EventClass : int
+    internal enum EventClass : int
     {
         /*
         kEventClassMouse            = FOUR_CHAR_CODE('mous'),
@@ -173,7 +173,7 @@ namespace OpenTK.Platform.MacOS.Carbon
         Menu = 0x6d656e75,
         Window = 0x77696e64,
     }
-    public enum WindowEventKind : int
+    internal enum WindowEventKind : int
     {
         // window events
         WindowUpdate = 1,
@@ -195,7 +195,7 @@ namespace OpenTK.Platform.MacOS.Carbon
         WindowClose = 72,
         WindowClosed = 73,
     }
-    public enum MouseEventKind : int
+    internal enum MouseEventKind : int
     {
         MouseDown = 1,
         MouseUp = 2,
@@ -205,14 +205,14 @@ namespace OpenTK.Platform.MacOS.Carbon
         MouseExited = 9,
         WheelMoved = 10,
     }
-    public enum MouseButton : short
+    internal enum MouseButton : short
     {
         Primary = 1,
         Secondary = 2,
         Tertiary = 3,
     }
 
-    public enum KeyboardEventKind : int
+    internal enum KeyboardEventKind : int
     {
         // raw keyboard events
         RawKeyDown = 1,
@@ -221,7 +221,7 @@ namespace OpenTK.Platform.MacOS.Carbon
         RawKeyModifiersChanged = 4,
     }
 
-    public enum AppEventKind : int
+    internal enum AppEventKind : int
     {
         // application events
         AppActivated = 1,
@@ -270,7 +270,7 @@ namespace OpenTK.Platform.MacOS.Carbon
         typeIEEE64BitFloatingPoint = 0x646f7562,
     }
 
-    public enum EventMouseButton : int
+    internal enum EventMouseButton : int
     {
         Primary = 0,
         Secondary = 1,

Source/OpenTK/Platform/MacOS/CarbonBindings/QuartzDisplayServicesAPI.cs

@@ -12,7 +12,7 @@ namespace OpenTK.Platform.MacOS.Carbon
 
     }
 
-    public static class CG
+    internal static class CG
     {
         const string appServices = "/System/Library/Frameworks/ApplicationServices.framework/Versions/Current/ApplicationServices";
 

Source/OpenTK/Platform/MacOS/CarbonBindings/SpeechChannel.cs

@@ -7,7 +7,7 @@ using System.Text;
 namespace OpenTK.Platform.MacOS.Carbon
 {
 
-    public class SpeechChannel
+    internal class SpeechChannel
     {
 
         private IntPtr _id;

Source/OpenTK/Platform/MacOS/EventInfo.cs

@@ -14,7 +14,7 @@ using System.Text;
 
 namespace OpenTK.Platform.MacOS.Carbon
 {
-    public struct EventInfo
+    internal struct EventInfo
     {
         internal EventInfo(IntPtr eventRef)
         {

Source/OpenTK/Platform/MacOS/MacOSException.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace OpenTK.Platform.MacOS
 {
-    public class MacOSException : Exception
+    internal class MacOSException : Exception
     {
         OSStatus errorCode;
 
@@ -31,7 +31,7 @@ namespace OpenTK.Platform.MacOS
         }
     }
 
-    public enum OSStatus
+    internal enum OSStatus
     {
         NoError = 0,
         

Source/OpenTK/Platform/Windows/WinGLContext.cs

@@ -233,6 +233,7 @@ namespace OpenTK.Platform.Windows
             set { throw new NotImplementedException(); }
         }
 
+        [Obsolete]
         public event DestroyEvent<IGraphicsContext> Destroy;
 
         #endregion

Source/OpenTK/Platform/Windows/WinWindowInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 namespace OpenTK.Platform.Windows
 {
     /// <summary>Describes a win32 window.</summary>
-    public sealed class WinWindowInfo : IWindowInfo
+    internal sealed class WinWindowInfo : IWindowInfo
     {
         IntPtr handle, dc;
         WinWindowInfo parent;

Source/OpenTK/Platform/X11/Structs.cs

@@ -712,13 +712,13 @@ namespace OpenTK.Platform.X11
         public IntPtr nitems;
     }
 
-    public enum XWindowClass
+    internal enum XWindowClass
     {
         InputOutput = 1,
         InputOnly = 2
     }
 
-    public enum XEventName
+    internal enum XEventName
     {
         KeyPress = 2,
         KeyRelease = 3,
@@ -758,7 +758,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum SetWindowValuemask
+    internal enum SetWindowValuemask
     {
         Nothing = 0,
         BackPixmap = 1,
@@ -778,7 +778,7 @@ namespace OpenTK.Platform.X11
         Cursor = 16384
     }
 
-    public enum CreateWindowArgs
+    internal enum CreateWindowArgs
     {
         CopyFromParent = 0,
         ParentRelative = 1,
@@ -786,7 +786,7 @@ namespace OpenTK.Platform.X11
         InputOnly = 2
     }
 
-    public enum Gravity
+    internal enum Gravity
     {
         ForgetGravity = 0,
         NorthWestGravity = 1,
@@ -802,7 +802,7 @@ namespace OpenTK.Platform.X11
     }
 
     [CLSCompliant(false)]
-    public enum XKeySym : uint
+    internal enum XKeySym : uint
     {
         XK_BackSpace = 0xFF08,
         XK_Tab = 0xFF09,
@@ -835,7 +835,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum EventMask
+    internal enum EventMask
     {
         NoEventMask = 0,
         KeyPressMask = 1 << 0,
@@ -865,7 +865,7 @@ namespace OpenTK.Platform.X11
         OwnerGrabButtonMask = 1 << 24
     }
 
-    public enum GrabMode
+    internal enum GrabMode
     {
         GrabModeSync = 0,
         GrabModeAsync = 1
@@ -897,7 +897,7 @@ namespace OpenTK.Platform.X11
         public byte pad;
     }
 
-    public enum Atom
+    internal enum Atom
     {
         AnyPropertyType = 0,
         XA_PRIMARY = 1,
@@ -998,7 +998,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum ChangeWindowAttributes
+    internal enum ChangeWindowAttributes
     {
         X = 1 << 0,
         Y = 1 << 1,
@@ -1025,7 +1025,7 @@ namespace OpenTK.Platform.X11
         OverrideRedirect = 1<<9,
     }
 
-    public enum StackMode
+    internal enum StackMode
     {
         Above = 0,
         Below = 1,
@@ -1047,21 +1047,21 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum ColorFlags
+    internal enum ColorFlags
     {
         DoRed = 1 << 0,
         DoGreen = 1 << 1,
         DoBlue = 1 << 2
     }
 
-    public enum NotifyMode
+    internal enum NotifyMode
     {
         NotifyNormal = 0,
         NotifyGrab = 1,
         NotifyUngrab = 2
     }
 
-    public enum NotifyDetail
+    internal enum NotifyDetail
     {
         NotifyAncestor = 0,
         NotifyVirtual = 1,
@@ -1074,7 +1074,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum KeyMasks
+    internal enum KeyMasks
     {
         ShiftMask = (1 << 0),
         LockMask = (1 << 1),
@@ -1095,7 +1095,7 @@ namespace OpenTK.Platform.X11
         public IntPtr modifiermap;
     }
 
-    public enum PropertyMode
+    internal enum PropertyMode
     {
         Replace = 0,
         Prepend = 1,
@@ -1124,7 +1124,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum GCFunction
+    internal enum GCFunction
     {
         GCFunction = 1 << 0,
         GCPlaneMask = 1 << 1,
@@ -1151,21 +1151,21 @@ namespace OpenTK.Platform.X11
         GCArcMode = 1 << 22
     }
 
-    public enum GCJoinStyle
+    internal enum GCJoinStyle
     {
         JoinMiter = 0,
         JoinRound = 1,
         JoinBevel = 2
     }
 
-    public enum GCLineStyle
+    internal enum GCLineStyle
     {
         LineSolid = 0,
         LineOnOffDash = 1,
         LineDoubleDash = 2
     }
 
-    public enum GCCapStyle
+    internal enum GCCapStyle
     {
         CapNotLast = 0,
         CapButt = 1,
@@ -1173,7 +1173,7 @@ namespace OpenTK.Platform.X11
         CapProjecting = 3
     }
 
-    public enum GCFillStyle
+    internal enum GCFillStyle
     {
         FillSolid = 0,
         FillTiled = 1,
@@ -1181,19 +1181,19 @@ namespace OpenTK.Platform.X11
         FillOpaqueStppled = 3
     }
 
-    public enum GCFillRule
+    internal enum GCFillRule
     {
         EvenOddRule = 0,
         WindingRule = 1
     }
 
-    public enum GCArcMode
+    internal enum GCArcMode
     {
         ArcChord = 0,
         ArcPieSlice = 1
     }
 
-    public enum GCSubwindowMode
+    internal enum GCSubwindowMode
     {
         ClipByChildren = 0,
         IncludeInferiors = 1
@@ -1227,7 +1227,7 @@ namespace OpenTK.Platform.X11
         public byte dashes;
     }
 
-    public enum GXFunction
+    internal enum GXFunction
     {
         GXclear = 0x0,		/* 0 */
         GXand = 0x1,		/* src AND dst */
@@ -1247,28 +1247,28 @@ namespace OpenTK.Platform.X11
         GXset = 0xf		/* 1 */
     }
 
-    public enum NetWindowManagerState
+    internal enum NetWindowManagerState
     {
         Remove = 0,
         Add = 1,
         Toggle = 2
     }
 
-    public enum RevertTo
+    internal enum RevertTo
     {
         None = 0,
         PointerRoot = 1,
         Parent = 2
     }
 
-    public enum MapState
+    internal enum MapState
     {
         IsUnmapped = 0,
         IsUnviewable = 1,
         IsViewable = 2
     }
 
-    public enum CursorFontShape
+    internal enum CursorFontShape
     {
         XC_X_cursor = 0,
         XC_arrow = 2,
@@ -1356,7 +1356,7 @@ namespace OpenTK.Platform.X11
         XC_num_glyphs = 154
     }
 
-    public enum SystrayRequest
+    internal enum SystrayRequest
     {
         SYSTEM_TRAY_REQUEST_DOCK = 0,
         SYSTEM_TRAY_BEGIN_MESSAGE = 1,
@@ -1364,7 +1364,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum XSizeHintsFlags
+    internal enum XSizeHintsFlags
     {
         USPosition = (1 << 0),
         USSize = (1 << 1),
@@ -1403,7 +1403,7 @@ namespace OpenTK.Platform.X11
     }
 
     [Flags]
-    public enum XWMHintsFlags
+    internal enum XWMHintsFlags
     {
         InputHint = (1 << 0),
         StateHint = (1 << 1),
@@ -1415,7 +1415,7 @@ namespace OpenTK.Platform.X11
         AllHints = (InputHint | StateHint | IconPixmapHint | IconWindowHint | IconPositionHint | IconMaskHint | WindowGroupHint)
     }
 
-    public enum XInitialState
+    internal enum XInitialState
     {
         DontCareState = 0,
         NormalState = 1,

Source/OpenTK/Platform/X11/X11GLContext.cs

@@ -265,6 +265,7 @@ namespace OpenTK.Platform.X11
 
         #endregion
 
+        [Obsolete]
         public event DestroyEvent<IGraphicsContext> Destroy;
 
         #region public IntPtr GetAddress(string function)
@@ -291,11 +292,13 @@ namespace OpenTK.Platform.X11
 
         #endregion
 
+        [Obsolete]
         public void RegisterForDisposal(IDisposable resource)
         {
             throw new NotSupportedException("Use OpenTK.GraphicsContext instead.");
         }
 
+        [Obsolete]
         public void DisposeResources()
         {
             throw new NotSupportedException("Use OpenTK.GraphicsContext instead.");