refactored CommandBarButton.Click to explicit event syntax

Author: retailcoder

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -85,7 +85,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
             if (item.Command != null)
             {
                 child.Click += child_Click;
-                ((CommandBarButton)child).HandleEvents();                
             }
             return child;
         }

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -159,7 +159,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
                 : string.Empty;
 
             child.Click += child_Click;
-            ((CommandBarButton)child).HandleEvents();
             return child;
         }
 

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs

@@ -15,16 +15,6 @@ public CommandBarButton(Microsoft.Office.Core.CommandBarButton target)
         {
         }
 
-        public void HandleEvents()
-        {
-            ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
-        }
-
-        public void StopEvents()
-        {
-            ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
-        }
-
         private Microsoft.Office.Core.CommandBarButton Button
         {
             get { return (Microsoft.Office.Core.CommandBarButton)Target; }
@@ -35,10 +25,24 @@ public static ICommandBarButton FromCommandBarControl(ICommandBarControl control
             return new CommandBarButton((Microsoft.Office.Core.CommandBarButton)control.Target);
         }
 
-        public event EventHandler<CommandBarButtonClickEventArgs> Click;
+        private EventHandler<CommandBarButtonClickEventArgs> _clickHandler; 
+        public event EventHandler<CommandBarButtonClickEventArgs> Click
+        {
+            add
+            {
+                ((Microsoft.Office.Core.CommandBarButton)Target).Click += Target_Click;
+                _clickHandler += value;
+            }
+            remove
+            {
+                ((Microsoft.Office.Core.CommandBarButton)Target).Click -= Target_Click;
+                _clickHandler -= value;
+            }
+        }
+
         private void Target_Click(Microsoft.Office.Core.CommandBarButton ctrl, ref bool cancelDefault)
         {
-            var handler = Click;
+            var handler = _clickHandler;
             if (handler == null)
             {
                 return;