[A11y] Tidy up the AtkCocoaHelpers

Separate AtkCocoaHelper into separate files for Mac and Noop

11 files changed, 22 insertions, 11 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs
index b23110814d..062fe43ad5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs
@@ -26,6 +26,7 @@
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 using Gtk;
 
 namespace MonoDevelop.Ide.WelcomePage
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
index eff427c5f6..36189bbde0 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs
@@ -28,6 +28,7 @@ using Gtk;
 using MonoDevelop.Core;
 using System.Xml.Linq;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
@@ -74,8 +75,8 @@ namespace MonoDevelop.Ide.WelcomePage
 
 		public WelcomePageBarButton (string title, string href, string iconResource = null)
 		{
-			var actionHandler = new AtkCocoaHelper.ActionDelegate ();
-			actionHandler.Actions = new AtkCocoaHelper.Actions [] { AtkCocoaHelper.Actions.AXPress };
+			var actionHandler = new ActionDelegate ();
+			actionHandler.Actions = new AtkCocoa.Actions [] { AtkCocoa.Actions.AXPress };
 			actionHandler.PerformPress += HandlePress;
 
 			Accessible.SetActionDelegate (actionHandler);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs
index 5d8b4b7196..849def07b9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageColumn.cs
@@ -27,6 +27,7 @@ using System;
 using Gtk;
 
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs
index 0a58851b57..a2b58cf648 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs
@@ -29,7 +29,8 @@ using Gtk;
 using MonoDevelop.Core;

 using System.Xml.Linq;

 using System.Text.RegularExpressions;

-using MonoDevelop.Components;

+using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;

 using System.Text;

 

 using System.Runtime.InteropServices;
@@ -150,8 +151,8 @@ namespace MonoDevelop.Ide.WelcomePage
 

 		public WelcomePageFeedItem ()

 		{
-			var actionDelegate = new AtkCocoaHelper.ActionDelegate ();
-			actionDelegate.Actions = new AtkCocoaHelper.Actions [] { AtkCocoaHelper.Actions.AXPress };
+			var actionDelegate = new ActionDelegate ();
+			actionDelegate.Actions = new AtkCocoa.Actions [] { AtkCocoa.Actions.AXPress };
 			actionDelegate.PerformPress += PerformPress;
 
 			Accessible.SetActionDelegate (actionDelegate);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs
index e040c2463a..c2b07faf30 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFrame.cs
@@ -38,6 +38,7 @@ using MonoDevelop.Ide.Desktop;
 using System.Reflection;
 using System.Xml.Linq;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
index 5c6fb5dbdc..7fc7bb3de4 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs
@@ -28,6 +28,7 @@ using System.Collections.Generic;
 
 using MonoDevelop.Core;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 using Gtk;
 
@@ -80,10 +81,10 @@ namespace MonoDevelop.Ide.WelcomePage
 			starPinnedHover = Xwt.Drawing.Image.FromResource ("star-hover-16.png");
 		}
 
-		AtkCocoaHelper.ActionDelegate actionHandler;
+		ActionDelegate actionHandler;
 		public WelcomePageListButton (string title, string subtitle, Xwt.Drawing.Image icon, string actionUrl)
 		{
-			actionHandler = new AtkCocoaHelper.ActionDelegate ();
+			actionHandler = new ActionDelegate ();
 			actionHandler.PerformPress += HandlePress;
 			actionHandler.PerformShowAlternateUI += HandleShowAlternateUI;
 			actionHandler.PerformShowDefaultUI += HandleShowDefaultUI;
@@ -117,12 +118,12 @@ namespace MonoDevelop.Ide.WelcomePage
 
 		void UpdateActions ()
 		{
-			List<AtkCocoaHelper.Actions> actions = new List<AtkCocoaHelper.Actions> ();
-			actions.Add (AtkCocoaHelper.Actions.AXPress);
+			var actions = new List<AtkCocoa.Actions> ();
+			actions.Add (AtkCocoa.Actions.AXPress);
 
 			if (AllowPinning) {
-				actions.Add (AtkCocoaHelper.Actions.AXShowAlternateUI);
-				actions.Add (AtkCocoaHelper.Actions.AXShowDefaultUI);
+				actions.Add (AtkCocoa.Actions.AXShowAlternateUI);
+				actions.Add (AtkCocoa.Actions.AXShowDefaultUI);
 			}
 			actionHandler.Actions = actions.ToArray ();
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs
index 4b9dab6631..ab35b1b242 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageNewsFeed.cs
@@ -28,6 +28,7 @@ using Gtk;
 using System;

 using MonoDevelop.Core;

 using MonoDevelop.Components;

+using MonoDevelop.Components.AtkCocoaHelper;

 using System.Collections.Generic;

 using System.Xml;

 using System.Xml.Linq;

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs
index c12e3d54b7..d7e6255a1a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs
@@ -28,6 +28,7 @@ using System;
 using System.Linq;

 using Gtk;

 using MonoDevelop.Core;

+using MonoDevelop.Components.AtkCocoaHelper;

 using System.Collections.Generic;

 using MonoDevelop.Ide.Desktop;

 using System.Xml.Linq;

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
index a8322c8cb9..84d1ca4792 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs
@@ -28,6 +28,7 @@ using Gtk;
 using System.Xml.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs
index acc717aea3..dd3835dfc6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using MonoDevelop.Ide.Fonts;
 
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 
 namespace MonoDevelop.Ide.WelcomePage
 {
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs
index 75bed9c7d0..e55d71f075 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs
@@ -38,6 +38,7 @@ using Gtk;
 using Mono.Addins;
 using MonoDevelop.Core;
 using MonoDevelop.Components;
+using MonoDevelop.Components.AtkCocoaHelper;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Desktop;