HIRect to NSRect. HISize to NSSize

diff --git a/src/OpenTK/OpenTK.csproj b/src/OpenTK/OpenTK.csproj
index 63c4345..b506a6d 100644 (file)
--- a/src/OpenTK/OpenTK.csproj
+++ b/src/OpenTK/OpenTK.csproj
@@ -750,9 +750,6 @@
     <Compile Include="Platform\MacOS\CarbonWindowInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Platform\MacOS\Carbon\CarbonAPI.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Platform\MacOS\Carbon\MacOSKeys.cs">
       <SubType>Code</SubType>
     </Compile>

diff --git a/src/OpenTK/Platform/MacOS/Carbon/CarbonAPI.cs b/src/OpenTK/Platform/MacOS/Carbon/CarbonAPI.cs
deleted file mode 100644 (file)
index 914b8c3..0000000
--- a/src/OpenTK/Platform/MacOS/Carbon/CarbonAPI.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-#region License
-//
-// The Open Toolkit Library License
-//
-// Copyright (c) 2006 - 2010 the Open Toolkit library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-// the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-#endregion
-
-//  Created by Erik Ylvisaker on 3/17/08.
-
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace OpenTK.Platform.MacOS.Carbon
-{
-    #region --- Types defined in HIGeometry.h ---
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct HIPoint
-    {
-        public float X;
-        public float Y;
-
-        public HIPoint(float x, float y)
-        {
-            X = x;
-            Y = y;
-        }
-
-        public HIPoint(double x, double y)
-            : this((float)x, (float)y)
-        { }
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct HISize
-    {
-        public float Width;
-        public float Height;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct HIRect
-    {
-        public HIPoint Origin;
-        public HISize Size;
-
-        public override string ToString()
-        {
-            return string.Format(
-                "Rect: [{0}, {1}, {2}, {3}]", Origin.X, Origin.Y, Size.Width, Size.Height);
-        }
-    }
-
-    #endregion
-}
-
-

diff --git a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
index 853d32d..710f5e7 100644 (file)
--- a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
+++ b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
@@ -61,8 +61,8 @@ namespace OpenTK.Platform.MacOS
         const string lib = "/System/Library/Frameworks/ApplicationServices.framework/Versions/Current/ApplicationServices";
 
         // CGPoint -> NSPoint
-        // CGSize -> HISize
-        // CGRect -> HIRect
+        // CGSize -> NSSize
+        // CGRect -> NSRect
 
         [DllImport(lib,EntryPoint="CGGetActiveDisplayList")]
         internal unsafe static extern CGDisplayErr GetActiveDisplayList(int maxDisplays, IntPtr* activeDspys, out int dspyCnt);
@@ -75,15 +75,15 @@ namespace OpenTK.Platform.MacOS
         // first parameter slot. This is normally handled automatically
         // by gcc/clang, but here we have to do it ourselves.
         // See "Listing 4" on https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/LowLevelABI/130-IA-32_Function_Calling_Conventions/IA32.html#//apple_ref/doc/uid/TP40002492-SW3
-        internal unsafe static HIRect DisplayBounds(IntPtr display)
+        internal unsafe static NSRect DisplayBounds(IntPtr display)
         {
-            HIRect rect;
+            NSRect rect;
             DisplayBounds(out rect, display);
             return rect;
         }
 
         [DllImport(lib, EntryPoint = "CGDisplayBounds")]
-        unsafe static extern void DisplayBounds(out HIRect rect, IntPtr display);
+        unsafe static extern void DisplayBounds(out NSRect rect, IntPtr display);
 
         [DllImport(lib,EntryPoint="CGDisplayPixelsWide")]
         internal static extern int DisplayPixelsWide(IntPtr display);

diff --git a/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs b/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs
index 79703cc..c4d87cb 100644 (file)
--- a/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs
+++ b/src/OpenTK/Platform/MacOS/QuartzDisplayDeviceDriver.cs
@@ -109,8 +109,8 @@ namespace OpenTK.Platform.MacOS
                         
                     }
                     
-                    HIRect bounds = CG.DisplayBounds(currentDisplay);
-                    Rectangle newRect = new Rectangle((int)bounds.Origin.X, (int)bounds.Origin.Y, (int)bounds.Size.Width, (int)bounds.Size.Height);
+                    NSRect bounds = CG.DisplayBounds(currentDisplay);
+                    Rectangle newRect = new Rectangle((int)bounds.Location.X, (int)bounds.Location.Y, (int)bounds.Size.Width, (int)bounds.Size.Height);
                     
                     Debug.Print("Display {0} bounds: {1}", i, newRect);