[Mac] Remove deprecated MonoMac code Pt.2

mono · Mar 13, 2017 · e1d161e · e1d161e
1 parent 4e3a334
commit e1d161e
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 33 deletions.
diff --git a/Xwt.XamMac/Xwt.Mac/ButtonBackend.cs b/Xwt.XamMac/Xwt.Mac/ButtonBackend.cs
@@ -248,7 +248,6 @@ public override void ResetCursorRects ()
 			}
 		}
 
-		#if !MONOMAC
 		public override bool AllowsVibrancy {
 			get {
 				// we don't support vibrancy
@@ -276,7 +275,6 @@ public override void SetButtonType (NSButtonType aType)
 				return base.EffectiveAppearance;
 			}
 		}
-		#endif
 
 		class ColoredButtonCell : NSButtonCell
 		{

diff --git a/Xwt.XamMac/Xwt.Mac/CanvasBackend.cs b/Xwt.XamMac/Xwt.Mac/CanvasBackend.cs
@@ -26,19 +26,9 @@
 // THE SOFTWARE.
 
 using System;
-using Xwt.Backends;
-
-#if MONOMAC
-using nint = System.Int32;
-using nfloat = System.Single;
-using MonoMac.CoreGraphics;
-using MonoMac.AppKit;
-using CGRect = System.Drawing.RectangleF;
-using CGSize = System.Drawing.SizeF;
-#else
-using CoreGraphics;
 using AppKit;
-#endif
+using CoreGraphics;
+using Xwt.Backends;
 
 namespace Xwt.Mac
 {

diff --git a/Xwt.XamMac/Xwt.Mac/ComboBoxBackend.cs b/Xwt.XamMac/Xwt.Mac/ComboBoxBackend.cs
@@ -203,7 +203,6 @@ public override void ResetCursorRects ()
 				AddCursorRect (Bounds, Backend.Cursor);
 		}
 
-		#if !MONOMAC
 		public override bool AllowsVibrancy {
 			get {
 				// we don't support vibrancy
@@ -212,7 +211,6 @@ public override void ResetCursorRects ()
 				return base.AllowsVibrancy;
 			}
 		}
-		#endif
 	}
 }
 
diff --git a/Xwt.XamMac/Xwt.Mac/GtkQuartz.cs b/Xwt.XamMac/Xwt.Mac/GtkQuartz.cs
@@ -25,14 +25,8 @@
 // THE SOFTWARE.
 using System;
 using System.Runtime.InteropServices;
-
-#if MONOMAC
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-#else
 using AppKit;
 using ObjCRuntime;
-#endif
 
 namespace Xwt.Mac
 {

diff --git a/Xwt.XamMac/Xwt.Mac/LabelBackend.cs b/Xwt.XamMac/Xwt.Mac/LabelBackend.cs
@@ -250,7 +250,6 @@ public override bool AcceptsFirstResponder ()
 			return false;
 		}
 
-		#if !MONOMAC
 		public override bool AllowsVibrancy {
 			get {
 				// we don't support vibrancy
@@ -259,7 +258,6 @@ public override bool AcceptsFirstResponder ()
 				return base.AllowsVibrancy;
 			}
 		}
-		#endif
 	}
 
 	class CustomTextFieldCell: NSTextFieldCell

diff --git a/Xwt.XamMac/Xwt.Mac/SeparatorBackend.cs b/Xwt.XamMac/Xwt.Mac/SeparatorBackend.cs
@@ -55,7 +55,6 @@ public SeparatorWidget ()
 			get { return this; }
 		}
 
-		#if !MONOMAC
 		public override bool AllowsVibrancy {
 			get {
 				// we don't support vibrancy
@@ -64,7 +63,6 @@ public SeparatorWidget ()
 				return base.AllowsVibrancy;
 			}
 		}
-		#endif
 	}
 }
 
diff --git a/Xwt.XamMac/Xwt.Mac/SliderBackend.cs b/Xwt.XamMac/Xwt.Mac/SliderBackend.cs
@@ -203,7 +203,6 @@ public override void ResetCursorRects ()
 			}
 		}
 
-		#if !MONOMAC
 		public override bool AllowsVibrancy {
 			get {
 				// we don't support vibrancy
@@ -212,7 +211,6 @@ public override void ResetCursorRects ()
 				return base.AllowsVibrancy;
 			}
 		}
-		#endif
 	}
 
 	public class MacSliderCell : NSSliderCell

diff --git a/Xwt.XamMac/Xwt.Mac/SpinButtonBackend.cs b/Xwt.XamMac/Xwt.Mac/SpinButtonBackend.cs
@@ -335,7 +335,6 @@ public void DisableEvent (object eventId)
 
 		class VibrancyStepper : NSStepper
 		{
-			#if !MONOMAC
 			public override bool AllowsVibrancy {
 				get {
 					// we don't support vibrancy
@@ -344,7 +343,6 @@ class VibrancyStepper : NSStepper
 					return base.AllowsVibrancy;
 				}
 			}
-			#endif
 		}
 	}
 }

diff --git a/Xwt.XamMac/Xwt.Mac/WindowBackend.cs b/Xwt.XamMac/Xwt.Mac/WindowBackend.cs
@@ -432,9 +432,6 @@ public void SetMainMenu (IMenuBackend menu)
 		#endregion
 
 		static Selector closeSel = new Selector ("close");
-		#if MONOMAC
-		static Selector retainSel = new Selector("retain");
-		#endif
 
 		bool disposing, disposed;