From c0e337d61f1df5a8b53135b1179c449b3f6544dc Mon Sep 17 00:00:00 2001
From: Nathan Garside <nathan@pixelatedlabs.com>
Date: Mon, 10 Feb 2020 09:44:20 +0000
Subject: [PATCH] Use enum in mac interop

---
 native/Avalonia.Native/inc/avalonia-native.h | 8 +++++++-
 native/Avalonia.Native/src/OSX/window.h      | 6 ------
 native/Avalonia.Native/src/OSX/window.mm     | 4 ++--
 src/Avalonia.Native/WindowImpl.cs            | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/native/Avalonia.Native/inc/avalonia-native.h b/native/Avalonia.Native/inc/avalonia-native.h
index ce4a592d67..ee57f54e59 100644
--- a/native/Avalonia.Native/inc/avalonia-native.h
+++ b/native/Avalonia.Native/inc/avalonia-native.h
@@ -25,6 +25,12 @@ struct IAvnGlSurfaceRenderingSession;
 struct IAvnAppMenu;
 struct IAvnAppMenuItem;
 
+enum SystemDecorations {
+    SystemDecorationsNone = 0,
+    SystemDecorationsBorderOnly = 1,
+    SystemDecorationsFull = 2,
+};
+
 struct AvnSize
 {
     double Width, Height;
@@ -236,7 +242,7 @@ AVNCOM(IAvnWindow, 04) : virtual IAvnWindowBase
 {
     virtual HRESULT ShowDialog (IAvnWindow* parent) = 0;
     virtual HRESULT SetCanResize(bool value) = 0;
-    virtual HRESULT SetHasDecorations(int value) = 0;
+    virtual HRESULT SetHasDecorations(SystemDecorations value) = 0;
     virtual HRESULT SetTitle (void* utf8Title) = 0;
     virtual HRESULT SetTitleBarColor (AvnColor color) = 0;
     virtual HRESULT SetWindowState(AvnWindowState state) = 0;
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index 23e3c22db7..3e626675d2 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -36,10 +36,4 @@ struct IWindowStateChanged
     virtual void WindowStateChanged () = 0;
 };
 
-typedef NS_ENUM(NSInteger, SystemDecorations) {
-    SystemDecorationsNone = 0,
-    SystemDecorationsBorderOnly = 1,
-    SystemDecorationsFull = 2,
-};
-
 #endif /* window_h */
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 4c70f661b7..2c03407732 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -508,11 +508,11 @@ private:
         }
     }
     
-    virtual HRESULT SetHasDecorations(int value) override
+    virtual HRESULT SetHasDecorations(SystemDecorations value) override
     {
         @autoreleasepool
         {
-            _hasDecorations = (SystemDecorations)value;
+            _hasDecorations = value;
             UpdateStyle();
 
             switch (_hasDecorations)
diff --git a/src/Avalonia.Native/WindowImpl.cs b/src/Avalonia.Native/WindowImpl.cs
index a540b026fa..73ec81ce57 100644
--- a/src/Avalonia.Native/WindowImpl.cs
+++ b/src/Avalonia.Native/WindowImpl.cs
@@ -68,9 +68,9 @@ namespace Avalonia.Native
             _native.CanResize = value;
         }
 
-        public void SetSystemDecorations(SystemDecorations enabled)
+        public void SetSystemDecorations(Controls.SystemDecorations enabled)
         {
-            _native.HasDecorations = (int)enabled;
+            _native.HasDecorations = (Interop.SystemDecorations)enabled;
         }
 
         public void SetTitleBarColor (Avalonia.Media.Color color)